Projet

Général

Profil

Révision f8e16685

Ajouté par Assos Assos il y a plus de 5 ans

Weekly update of contrib modules

Voir les différences:

drupal7/sites/all/modules/uuid/composer.json
1
{
2
  "name": "drupal/uuid",
3
  "description": "Extends the entity functionality and adds support for universally unique identifiers.",
4
  "type": "drupal-module",
5
  "license": "GPL-2.0+",
6
  "minimum-stability": "dev",
7
  "require-dev": {
8
    "drupal/ctools": "1.x-dev",
9
    "drupal/rest_server": "~3.0",
10
    "drupal/services": "~3.0",
11
    "drupal/entity": "~1.0"
12
  }
13
}
drupal7/sites/all/modules/uuid/uuid.info
7 7
dependencies[] = node
8 8
dependencies[] = user
9 9

  
10
; Information added by Drupal.org packaging script on 2018-07-19
11
version = "7.x-1.2"
10
; Information added by Drupal.org packaging script on 2019-05-29
11
version = "7.x-1.3"
12 12
core = "7.x"
13 13
project = "uuid"
14
datestamp = "1531990689"
14
datestamp = "1559150887"
drupal7/sites/all/modules/uuid/uuid.test
6 6
 */
7 7

  
8 8
/**
9
 * UUID test helper trait.
10
 *
11
 * Contains methods that assist with running UUID tests.
9
 * Base class with some helper methods.
12 10
 */
13
trait UUIDTestHelper {
11
abstract class UUIDTestCase extends DrupalWebTestCase {
14 12

  
15 13
  /**
16 14
   * Helper function that asserts a UUID.
......
21 19

  
22 20
}
23 21

  
24
/**
25
 * Base class with some helper methods.
26
 */
27
abstract class UUIDTestCase extends DrupalWebTestCase {
28

  
29
  use UUIDTestHelper;
30

  
31
}
32

  
33 22
/**
34 23
 * Tests the UUID API functions.
35 24
 */
......
488 477
 */
489 478
class UUIDCommentTestCase extends CommentHelperCase {
490 479

  
491
  use UUIDTestHelper;
492

  
493 480
  /**
494 481
   * {@inheritdoc}
495 482
   */
......
501 488
    );
502 489
  }
503 490

  
491
  /**
492
   * Helper function that asserts a UUID.
493
   */
494
  protected function assertUuid($uuid, $message = NULL) {
495
    $this->assertTrue(uuid_is_valid($uuid), $message);
496
  }
497

  
504 498
  /**
505 499
   * Test CRUD on comments with UUID functions.
506 500
   */
......
559 553
 */
560 554
class UUIDTaxonomyTestCase extends TaxonomyWebTestCase {
561 555

  
562
  use UUIDTestHelper;
563

  
564 556
  /**
565 557
   * {@inheritdoc}
566 558
   */
......
588 580
    parent::setUp($modules);
589 581
  }
590 582

  
583
  /**
584
   * Helper function that asserts a UUID.
585
   */
586
  protected function assertUuid($uuid, $message = NULL) {
587
    $this->assertTrue(uuid_is_valid($uuid), $message);
588
  }
589

  
591 590
  /**
592 591
   * Test CRUD on comments with UUID functions.
593 592
   */
drupal7/sites/all/modules/uuid/uuid_path/uuid_path.info
5 5
dependencies[] = uuid
6 6

  
7 7

  
8
; Information added by Drupal.org packaging script on 2018-07-19
9
version = "7.x-1.2"
8
; Information added by Drupal.org packaging script on 2019-05-29
9
version = "7.x-1.3"
10 10
core = "7.x"
11 11
project = "uuid"
12
datestamp = "1531990689"
12
datestamp = "1559150887"
drupal7/sites/all/modules/uuid/uuid_services/uuid_services.info
3 3
core = 7.x
4 4
package = Services - resources
5 5

  
6
files[] = uuid_services.user_services.test
7

  
6 8
dependencies[] = services
7 9
dependencies[] = uuid
8 10
dependencies[] = entity
......
13 15
test_dependencies[] = field
14 16
test_dependencies[] = file_entity
15 17

  
16
; Information added by Drupal.org packaging script on 2018-07-19
17
version = "7.x-1.2"
18
; Information added by Drupal.org packaging script on 2019-05-29
19
version = "7.x-1.3"
18 20
core = "7.x"
19 21
project = "uuid"
20
datestamp = "1531990689"
22
datestamp = "1559150887"
drupal7/sites/all/modules/uuid/uuid_services/uuid_services.module
170 170
        }
171 171
      }
172 172
    }
173

  
174
    // Sanitize user roles if user is not allowed to modify them.
175
    if ($entity_type == 'user' && !empty($entity->roles) && !user_access('administer permissions')) {
176
      $original_user = user_load(entity_get_id_by_uuid('user', array($entity->uuid))[$entity->uuid]);
177
      $entity->roles = $original_user->roles;
178
    }
179

  
173 180
    entity_uuid_save($entity_type, $entity);
174 181
    return $entity;
175 182
  }
......
194 201
      return TRUE;
195 202
    }
196 203

  
197
    $return = entity_uuid_delete($entity_type, array($uuid)) !== FALSE;
204
    $return = entity_uuid_delete($entity_type, $uuid) !== FALSE;
198 205
    return $return;
199 206
  }
200 207
  catch (Exception $exception) {
drupal7/sites/all/modules/uuid/uuid_services/uuid_services.user_services.test
1
<?php
2

  
3
/**
4
 * @file
5
 * Test the UUID User Services integration.
6
 */
7

  
8
 /**
9
  * Test the UUID User Services integration.
10
  */
11
class UuidUserServicesTest extends ServicesWebTestCase {
12

  
13
  /**
14
   * The endpoint configuration.
15
   *
16
   * @var object
17
   */
18
  protected $endpoint = NULL;
19

  
20
  /**
21
   * {@inheritdoc}
22
   */
23
  public static function getInfo() {
24
    return array(
25
      'name' => 'UUID User Services tests',
26
      'description' => 'Test the user services resource UUID methods and actions.',
27
      'group' => 'UUID',
28
    );
29
  }
30

  
31
  /**
32
   * {@inheritdoc}
33
   */
34
  public function setUp() {
35
    parent::setUp(
36
      'ctools',
37
      'services',
38
      'rest_server',
39
      'uuid_services'
40
    );
41
    $this->endpoint = $this->saveNewEndpoint();
42
  }
43

  
44
  /**
45
   * {@inheritdoc}
46
   */
47
  public function saveNewEndpoint() {
48
    $edit = $this->populateEndpointFAPI();
49
    $endpoint = new stdClass();
50
    $endpoint->disabled = FALSE;
51
    $endpoint->api_version = 3;
52
    $endpoint->name = $edit['name'];
53
    $endpoint->server = $edit['server'];
54
    $endpoint->path = $edit['path'];
55
    $endpoint->authentication = array(
56
      'services' => 'services',
57
    );
58
    $endpoint->server_settings = array(
59
      'formatters' => array(
60
        'json' => TRUE,
61
        'bencode' => TRUE,
62
        'rss' => TRUE,
63
        'plist' => TRUE,
64
        'xmlplist' => TRUE,
65
        'php' => TRUE,
66
        'yaml' => TRUE,
67
        'jsonp' => FALSE,
68
        'xml' => FALSE,
69
      ),
70
      'parsers' => array(
71
        'application/x-yaml' => TRUE,
72
        'application/json' => TRUE,
73
        'application/vnd.php.serialized' => TRUE,
74
        'application/plist' => TRUE,
75
        'application/plist+xml' => TRUE,
76
        'application/x-www-form-urlencoded' => TRUE,
77
        'multipart/form-data' => TRUE,
78
      ),
79
    );
80
    $endpoint->resources = array(
81
      'user' => array(
82
        'operations' => array(
83
          'create' => array(
84
            'enabled' => 1,
85
          ),
86
          'retrieve' => array(
87
            'enabled' => 1,
88
          ),
89
          'update' => array(
90
            'enabled' => 1,
91
          ),
92
          'delete' => array(
93
            'enabled' => 1,
94
          ),
95
          'index' => array(
96
            'enabled' => 1,
97
          ),
98
        ),
99
      ),
100
    );
101
    $endpoint->debug = 1;
102
    $endpoint->export_type = FALSE;
103
    services_endpoint_save($endpoint);
104
    $endpoint = services_endpoint_load($endpoint->name);
105
    $this->assertTrue($endpoint->name == $edit['name'], 'Endpoint successfully created');
106
    return $endpoint;
107
  }
108

  
109
  /**
110
   * Tests user Retrieve.
111
   */
112
  public function testUserRetrieve() {
113
    $admin_user = $this->drupalCreateUser(array(
114
      'administer services',
115
      'administer users',
116
    ));
117
    $this->drupalLogin($admin_user);
118
    $other_user = $this->drupalCreateUser();
119

  
120
    // Verify user is found.
121
    $response = $this->servicesGet($this->endpoint->path . '/user/' . $other_user->uuid);
122
    $this->assertTrue($other_user->uuid == $response['body']->uuid,
123
      'Successfully received User info');
124
  }
125

  
126
  /**
127
   * Tests user Update his own account.
128
   */
129
  public function testUserUpdate() {
130
    $admin_user = $this->drupalCreateUser(array(
131
      'administer services',
132
      'administer users',
133
      'administer permissions',
134
    ));
135
    $this->drupalLogin($admin_user);
136

  
137
    $other_user = $this->drupalCreateUser();
138
    $update = array(
139
      'uuid' => $other_user->uuid,
140
      'roles' => array(
141
        '2' => 'authenticated user',
142
        '3' => 'administrator',
143
      ),
144
    );
145
    $this->servicesPut($this->endpoint->path . '/user/' . $other_user->uuid, $update);
146
    $user_after_update = user_load($other_user->uid, TRUE);
147
    $this->assertTrue(in_array('administrator', $user_after_update->roles), 'Administrator role successfully added');
148
  }
149

  
150
  /**
151
   * Tests user Update another account fail with no permissions.
152
   */
153
  public function testUserUpdatePermFail() {
154
    $user = $this->drupalCreateUser();
155
    $this->drupalLogin($user);
156

  
157
    $other_user = $this->drupalCreateUser();
158

  
159
    $update = array(
160
      'uuid' => $other_user->uuid,
161
      'name' => 'test_edit',
162
      'roles' => array(
163
        '2' => 'authenticated user',
164
        '3' => 'administrator',
165
      ),
166
    );
167
    $response = $this->servicesPut($this->endpoint->path . '/user/' . $other_user->uuid, $update);
168
    $user_after_update = user_load($other_user->uid, TRUE);
169
    $this->assertNotEqual($update['name'], $user_after_update->name, 'User name was not updated without the needed permissions');
170
    $this->assertFalse(in_array('administrator', $user_after_update->roles), 'Administrator role was not added without the needed permissions');
171
    $this->assertTrue($response['code'] == 403,
172
      'Updating the user failed without the needed permissions');
173
  }
174

  
175
  /**
176
   * Tests user Update his own account fail with no permissions.
177
   */
178
  public function testUserOwnUpdatePermFail() {
179
    $user = $this->drupalCreateUser([
180
      'access user profiles',
181
    ]);
182
    $this->drupalLogin($user);
183
    $user = user_load($user->uid, TRUE);
184

  
185
    $update = array(
186
      'uuid' => $user->uuid,
187
      'roles' => array(
188
        '2' => 'authenticated user',
189
        '3' => 'administrator',
190
      ),
191
    );
192
    $this->servicesPut($this->endpoint->path . '/user/' . $user->uuid, $update);
193
    $user_after_update = user_load($user->uid, TRUE);
194
    $this->assertFalse(in_array('administrator', $user_after_update->roles), 'Administrator role was not added without the needed permissions');
195
    $this->assertEqual($user->roles, $user_after_update->roles, 'Existing roles persist after update.');
196
  }
197

  
198
  /**
199
   * Tests user Delete.
200
   */
201
  public function testUserDelete() {
202
    $admin_user = $this->drupalCreateUser(array(
203
      'administer services',
204
      'administer users',
205
    ));
206
    $this->drupalLogin($admin_user);
207

  
208
    $other_user = $this->drupalCreateUser();
209

  
210
    $this->servicesDelete($this->endpoint->path . '/user/' . $other_user->uuid);
211
    $user_after_update = user_load($other_user->uid, TRUE);
212
    $this->assertTrue(empty($user_after_update), 'User was deleted');
213
  }
214

  
215
  /**
216
   * Tests user Delete fail with no permissions.
217
   */
218
  public function testUserDeletePermFail() {
219
    $user = $this->drupalCreateUser();
220
    $this->drupalLogin($user);
221

  
222
    $other_user = $this->drupalCreateUser();
223

  
224
    $response = $this->servicesDelete($this->endpoint->path . '/user/' . $other_user->uuid);
225
    $user_after_update = user_load($other_user->uid, TRUE);
226
    $this->assertTrue(!empty($user_after_update), 'User was not deleted without the needed permissions');
227
    $this->assertTrue($response['code'] == 403,
228
      'Deleting the user failed without the needed permissions');
229
  }
230

  
231
}
drupal7/sites/all/modules/uuid/uuid_services_example/uuid_services_example.info
11 11
features[features_api][] = api:2
12 12
features[services_endpoint][] = uuid_services_example
13 13

  
14
; Information added by Drupal.org packaging script on 2018-07-19
15
version = "7.x-1.2"
14
; Information added by Drupal.org packaging script on 2019-05-29
15
version = "7.x-1.3"
16 16
core = "7.x"
17 17
project = "uuid"
18
datestamp = "1531990689"
18
datestamp = "1559150887"
drupal7/sites/all/themes/adminimal_theme/adminimal.info
1 1
name = Adminimal
2 2
description = Minimalist administration theme.
3 3
core = 7.x
4
scripts[] = js/jRespond.js
4
scripts[] = js/jrespond.js
5 5
scripts[] = js/adminimal_theme.js
6 6
settings[use_bootstrap_grids] = 1
7 7
settings[shortcut_module_link] = 1
......
25 25
regions[page_top] = Page top
26 26
regions[page_bottom] = Page bottom
27 27

  
28
; Information added by Drupal.org packaging script on 2019-01-21
29
version = "7.x-1.25"
28
; Information added by Drupal.org packaging script on 2019-05-23
29
version = "7.x-1.26"
30 30
core = "7.x"
31 31
project = "adminimal_theme"
32
datestamp = "1548089013"
32
datestamp = "1558584494"
drupal7/sites/all/themes/adminimal_theme/css/ckeditor-adminimal.css
107 107

  
108 108
body.adminimal-theme .cke_reset_all fieldset {
109 109
  border: 1px solid #DDDDDD;
110
  border-top: 3px solid #0074BD;
111 110
  padding: 10px;
112 111
}
113 112

  
......
116 115
  font-size: 18px;
117 116
  font-weight: 100;
118 117
  padding: 0 0.5em;
118
  background-color: #FFFFFF;
119 119
}
120 120

  
121 121
body.adminimal-theme .cke_combopanel {
......
191 191
body.adminimal-theme .cke_ltr .cke_dialog_close_button {
192 192
  background: url("images/x-white.png") scroll no-repeat 50% 2px #B73939;
193 193
  right: 10px;
194
  top: 1px;
194
  top: 9px;
195 195
  width: 45px;
196 196
}
197 197

  
drupal7/sites/all/themes/adminimal_theme/css/mobile.css
168 168
  border: none;
169 169
}
170 170

  
171
body.adminimal-skin-alternative div.vertical-tabs .vertical-tabs-panes,
171 172
div.vertical-tabs .vertical-tabs-list {
172 173
  margin: 0;
173 174
  width: 100%;
175
  padding-right: 0;
174 176
  padding-bottom: 20px;
175 177
  width: 100%;
176 178
  border: none;
drupal7/sites/all/themes/adminimal_theme/css/style.css
27 27
body.adminimal-theme * {
28 28
  -webkit-font-smoothing: antialiased;
29 29
  -moz-osx-font-smoothing: grayscale;
30
  -moz-box-sizing: border-box;
31
  -webkit-box-sizing: border-box;
32
  box-sizing: border-box;
30 33
}
31 34

  
32 35
body.adminimal-theme .panel-panel {
......
1647 1650
  width: 16px;
1648 1651
}
1649 1652

  
1653
body.adminimal-theme .views-admin .views-field-excluded,
1654
body.adminimal-theme .views-admin .views-display-disabled-link {
1655
  opacity: .5;
1656
}
1657

  
1650 1658
#simplenews-admin-filter .spacer {
1651 1659
  float: left;
1652 1660
  margin-top: 10px;
......
2256 2264
  padding-bottom: 5px;
2257 2265
}
2258 2266

  
2267
body.adminimal-theme .views-display-top ul#views-display-menu-tabs li a.error {
2268
  background: #f2dede;
2269
}
2270

  
2259 2271
body.adminimal-theme .views-display-top ul#views-display-menu-tabs li a.active {
2260 2272
  box-shadow: 0px 1px 0px #0073BC;
2261 2273
  color: #0073BC;
......
2817 2829
  margin: 0;
2818 2830
  z-index: 999;
2819 2831
}
2832
body.sticky-actions .ajax-new-content .form-actions.form-wrapper {
2833
  position: initial;
2834
  bottom: initial;
2835
  background: initial;
2836
  border-top: none;
2837
  width: initial;
2838
  left: initial;
2839
  padding: 0;
2840
  margin: 20px 0 0;
2841
  z-index: initial;
2842
}
2820 2843

  
2821 2844
body.sticky-actions #page {
2822 2845
  margin-bottom: 60px;
......
3009 3032
  right: 0;
3010 3033
}
3011 3034

  
3035
[dir="rtl"] body.sticky-actions .ajax-new-content .form-actions.form-wrapper {
3036
  right: initial;
3037
}
3038

  
3012 3039
html[dir="rtl"].js input.form-autocomplete {
3013 3040
  text-indent: 1em;
3014 3041
}
......
3048 3075
  padding-left: 0;
3049 3076
}
3050 3077

  
3078
/* Fix Views Responsive Grid module see #2680767 */
3079
body.page-admin-structure-views-view #views-ui-edit-display-form #edit-options input.form-text {
3080
  -webkit-box-sizing: border-box;
3081
  -moz-box-sizing: border-box;
3082
  -ms-box-sizing: border-box;
3083
  -o-box-sizing: border-box;
3084
  box-sizing: border-box;
3085
  max-width: 100%;
3086
  -webkit-padding-end: 8px;
3087
}
3088

  
3051 3089
.page-admin-structure-features-create form div.buttons {
3052 3090
  text-align: left;
3053 3091
}
......
3068 3106
body.page-admin-structure-views-view #content-wrapper #main-content {
3069 3107
  display: initial;
3070 3108
}
3109

  
3110
/* Diff revisions view */
3111
table.diff th a {
3112
  display: inline;
3113
}
3114

  
3115
table.diff th,
3116
table.diff td,
3117
div.diff-section-title,
3118
.page-node-revisions-view .node {
3119
  padding: 0.5em;
3120
}
3121

  
3122
table.diff .diff-prevlink,
3123
table.diff .diff-nextlink,
3124
table.diff .diff-links {
3125
  padding-left: 0;
3126
  padding-right: 0;
3127
}
3128

  
3129
table.diff .diff-prevlink a,
3130
table.diff .diff-nextlink a {
3131
  padding: 0.5em 0.75em;
3132
  background-color: #eee;
3133
}
3134

  
3135
table.diff .diff-links a {
3136
  display: inline-block;
3137
  padding: 0.25em 0.75em;
3138
  background-color: #efefef;
3139
}
3140

  
3141
table.diff .diff-links a.active {
3142
  background-color: #eee;
3143
  font-weight: bold;
3144
  display: inline-block;
3145
  padding: 0.25em 0.75em;
3146
}
3147

  
3148
table.diff td.diff-section-title,
3149
div.diff-section-title {
3150
  font-size: 1em;
3151
}
drupal7/sites/all/themes/adminimal_theme/skins/alternative/alternative.css
146 146
}
147 147

  
148 148
/* Green Button */
149
a.button-green,
149 150
input[type="submit"][id^="edit-submit"],
150 151
input#edit-actions-submit,
151 152
input[id^="save-continue"],
......
172 173
  transition: all, 0.3s;
173 174
}
174 175

  
176
a.button-green:hover,
175 177
input[type="submit"][id^="edit-submit"]:hover,
176 178
input#edit-actions-submit:hover,
177 179
input[id^="save-continue"]:hover,
......
189 191
  color: #fff;
190 192
}
191 193

  
194
a.button-green:active,
192 195
input[type="submit"][id^="edit-submit"]:active,
193 196
input#edit-actions-submit:active,
194 197
input[id^="save-continue"]:active,
......
204 207
  color: #fff;
205 208
}
206 209

  
210
a.button-green:focus,
207 211
input[type="submit"][id^="edit-submit"]:focus,
208 212
input#edit-actions-submit:focus,
209 213
input[id^="save-continue"]:focus,
......
218 222
}
219 223

  
220 224
/* Red Button */
225
a.button-red,
221 226
input#edit-delete,
222 227
input#remove-button,
223 228
input#edit-remove,
......
243 248
  transition: all, 0.3s;
244 249
}
245 250

  
251
a.button-red:hover,
246 252
input#edit-delete:hover,
247 253
input#remove-button:hover,
248 254
input#edit-remove:hover,
......
259 265
  color: #fff;
260 266
}
261 267

  
268
a.button-red:active,
262 269
input#edit-delete:active,
263 270
input#remove-button:active,
264 271
input#edit-remove:active,
......
273 280
  color: #fff;
274 281
}
275 282

  
283
a.button-red:focus,
276 284
input#edit-delete:focus,
277 285
input#remove-button:focus,
278 286
input#edit-remove:focus,
......
286 294
}
287 295

  
288 296
/* Blue Button */
297
a.button-blue,
289 298
input#edit-preview,
290 299
input#edit-next,
291 300
input#preview-submit,
......
307 316
  transition: all, 0.3s;
308 317
}
309 318

  
319
a.button-blue:hover,
310 320
input#edit-preview:hover,
311 321
input#edit-next:hover,
312 322
input#preview-submit:hover,
......
319 329
  color: #fff;
320 330
}
321 331

  
332
a.button-blue:active,
322 333
input#edit-preview:active,
323 334
input#edit-next:active,
324 335
input#preview-submit:active,
......
330 341
  color: #fff;
331 342
}
332 343

  
344
a.button-blue:focus,
333 345
input#edit-preview:focus,
334 346
input#edit-next:focus,
335 347
input#preview-submit:focus,
......
340 352
}
341 353

  
342 354
/* Orange Button */
355
a.button-orange,
343 356
#edit-cancel,
344 357
#edit-actions-cancel,
345 358
input#edit-buttons-revert,
......
367 380
  border: none;
368 381
}
369 382

  
383
a.button-orange:hover,
370 384
#edit-cancel:hover,
371 385
#edit-actions-cancel:hover,
372 386
input#edit-buttons-revert:hover,
......
379 393
  color: #fff;
380 394
}
381 395

  
396
a.button-orange:active,
382 397
#edit-cancel:active,
383 398
#edit-actions-cancel:active,
384 399
input#edit-buttons-revert:active,
......
388 403
  color: #fff;
389 404
}
390 405

  
406
a.button-orange:focus,
391 407
#edit-cancel:focus,
392 408
#edit-actions-cancel:focus,
393 409
input#edit-buttons-revert:focus,
drupal7/sites/all/themes/adminimal_theme/skins/dark/dark.css
466 466
  box-shadow: -20px 2px 40px rgba(0,0,0,0.4);
467 467
}
468 468

  
469
body.sticky-actions .ajax-new-content .form-actions.form-wrapper {
470
  box-shadow: none;
471
}
472

  
469 473
.adminimal-skin-dark #branding {
470 474
  background-color: #252525;
471 475
}
drupal7/sites/all/themes/adminimal_theme/skins/default/default.css
1 1
/* Style checkbox and radio buttons in Chrome + Safari + Opera */
2 2
@supports (-webkit-appearance:none) {
3
  .style-checkboxes input[type=checkbox],
4
  .style-checkboxes input[type=radio],
5
  .style-checkboxes input[type=checkbox]#edit-delete {
3
  .style-checkboxes input[type=checkbox]:not(.element-hidden),
4
  .style-checkboxes input[type=radio]:not(.element-hidden),
5
  .style-checkboxes input[type=checkbox]#edit-delete:not(.element-hidden) {
6 6
    -webkit-appearance:none;
7 7
    display: inline-block;
8 8
    position: relative;
......
126 126
}
127 127

  
128 128
/* Green Button */
129
a.button-green,
129 130
input[type="submit"][id^="edit-submit"],
130 131
input#edit-actions-submit,
131 132
input[id^="save-continue"],
......
152 153
  transition: all, 0.3s;
153 154
}
154 155

  
156
a.button-green:hover,
155 157
input[type="submit"][id^="edit-submit"]:hover,
156 158
input#edit-actions-submit:hover,
157 159
input[id^="save-continue"]:hover,
......
169 171
  color: #fff;
170 172
}
171 173

  
174
a.button-green:active,
172 175
input[type="submit"][id^="edit-submit"]:active,
173 176
input#edit-actions-submit:active,
174 177
input[id^="save-continue"]:active,
......
184 187
  color: #fff;
185 188
}
186 189

  
190
a.button-green:focus,
187 191
input[type="submit"][id^="edit-submit"]:focus,
188 192
input#edit-actions-submit:focus,
189 193
input[id^="save-continue"]:focus,
......
198 202
}
199 203

  
200 204
/* Red Button */
205
a.button-red,
201 206
input#edit-delete,
202 207
input#remove-button,
203 208
input#edit-remove,
......
223 228
  transition: all, 0.3s;
224 229
}
225 230

  
231
a.button-red:hover,
226 232
input#edit-delete:hover,
227 233
input#remove-button:hover,
228 234
input#edit-remove:hover,
......
239 245
  color: #fff;
240 246
}
241 247

  
248
a.button-red:active,
242 249
input#edit-delete:active,
243 250
input#remove-button:active,
244 251
input#edit-remove:active,
......
253 260
  color: #fff;
254 261
}
255 262

  
263
a.button-red:focus,
256 264
input#edit-delete:focus,
257 265
input#remove-button:focus,
258 266
input#edit-remove:focus,
......
266 274
}
267 275

  
268 276
/* Blue Button */
277
a.button-blue,
269 278
input#edit-preview,
270 279
input#edit-next,
271 280
input#preview-submit,
......
287 296
  transition: all, 0.3s;
288 297
}
289 298

  
299
a.button-blue:hover,
290 300
input#edit-preview:hover,
291 301
input#edit-next:hover,
292 302
input#preview-submit:hover,
......
299 309
  color: #fff;
300 310
}
301 311

  
312
a.button-blue:active,
302 313
input#edit-preview:active,
303 314
input#edit-next:active,
304 315
input#preview-submit:active,
......
310 321
  color: #fff;
311 322
}
312 323

  
324
a.button-blue:focus,
313 325
input#edit-preview:focus,
314 326
input#edit-next:focus,
315 327
input#preview-submit:focus,
......
320 332
}
321 333

  
322 334
/* Orange Button */
335
a.button-orange,
323 336
#edit-cancel,
324 337
#edit-actions-cancel,
325 338
input#edit-buttons-revert,
......
347 360
  border: none;
348 361
}
349 362

  
363
a.button-orange:hover,
350 364
#edit-cancel:hover,
351 365
#edit-actions-cancel:hover,
352 366
input#edit-buttons-revert:hover,
......
359 373
  color: #fff;
360 374
}
361 375

  
376
a.button-orange:active,
362 377
#edit-cancel:active,
363 378
#edit-actions-cancel:active,
364 379
input#edit-buttons-revert:active,
......
368 383
  color: #fff;
369 384
}
370 385

  
386
a.button-orange:focus,
371 387
#edit-cancel:focus,
372 388
#edit-actions-cancel:focus,
373 389
input#edit-buttons-revert:focus,
......
464 480
body.sticky-actions .form-actions.form-wrapper {
465 481
  box-shadow: -20px 2px 40px rgba(0,0,0,0.4);
466 482
}
483

  
484
body.sticky-actions .ajax-new-content .form-actions.form-wrapper {
485
  box-shadow: none;
486
}
drupal7/sites/all/themes/adminimal_theme/skins/material/material.css
688 688
  padding: .5em 10px .5em 30px;
689 689
}
690 690

  
691
body.adminimal-skin-material table tbody td a.tabledrag-handle {
692
  padding-top: 0;
693
  padding-bottom: 0;
694
}
695

  
691 696
body.adminimal-skin-material table tbody td a.module-link {
692 697
    background-position-x: 10px;
693 698
}
......
742 747

  
743 748

  
744 749
/* Green Button */
750
a.button-green,
745 751
input[type="submit"][id^="edit-submit"],
746 752
input#edit-actions-submit,
747 753
input[id^="save-continue"],
......
766 772
  border-radius: 0.2rem;
767 773
}
768 774

  
775
a.button-green:hover,
769 776
input[type="submit"][id^="edit-submit"]:hover,
770 777
input#edit-actions-submit:hover,
771 778
input[id^="save-continue"]:hover,
......
779 786
  box-shadow: 0 2px 6px rgba(0,0,0,.3);
780 787
}
781 788

  
789
a.button-green:active,
782 790
input[type="submit"][id^="edit-submit"]:active,
783 791
input#edit-actions-submit:active,
784 792
input[id^="save-continue"]:active,
......
793 801
  box-shadow: inset 0 0px 8px rgba(0,0,0,0.4);
794 802
}
795 803

  
804
a.button-green:focus,
796 805
input[type="submit"][id^="edit-submit"]:focus,
797 806
input#edit-actions-submit:focus,
798 807
input[id^="save-continue"]:focus,
......
808 817
}
809 818

  
810 819
/* Red Button */
820
a.button-red,
811 821
input#edit-delete,
812 822
input#remove-button,
813 823
input#edit-remove,
......
833 843
  transition: all, 0.3s;
834 844
}
835 845

  
846
a.button-red:hover,
836 847
input#edit-delete:hover,
837 848
input#remove-button:hover,
838 849
input#edit-remove:hover,
......
846 857
  box-shadow: 0 2px 6px rgba(0,0,0,.3);
847 858
}
848 859

  
860
a.button-red:active,
849 861
input#edit-delete:active,
850 862
input#remove-button:active,
851 863
input#edit-remove:active,
......
859 871
  box-shadow: inset 0 0px 8px rgba(0,0,0,0.4);
860 872
}
861 873

  
874
a.button-red:focus,
862 875
input#edit-delete:focus,
863 876
input#remove-button:focus,
864 877
input#edit-remove:focus,
......
873 886
}
874 887

  
875 888
/* Blue Button */
889
a.button-blue,
876 890
input#edit-preview,
877 891
input#edit-next,
878 892
input#preview-submit,
......
894 908
  transition: all, 0.3s;
895 909
}
896 910

  
911
a.button-blue:hover,
897 912
input#edit-preview:hover,
898 913
input#edit-next:hover,
899 914
input#preview-submit:hover,
......
903 918
  box-shadow: 0 2px 6px rgba(0,0,0,.3);
904 919
}
905 920

  
921
a.button-blue:active,
906 922
input#edit-preview:active,
907 923
input#edit-next:active,
908 924
input#preview-submit:active,
......
915 931
  box-shadow: inset 0 0px 8px rgba(0,0,0,0.4);
916 932
}
917 933

  
934
a.button-blue:focus,
918 935
input#edit-preview:focus,
919 936
input#edit-next:focus,
920 937
input#preview-submit:focus,
......
928 945
}
929 946

  
930 947
/* Orange Button */
948
a.button-orange,
931 949
#edit-cancel,
932 950
#edit-actions-cancel,
933 951
input#edit-buttons-revert,
......
951 969
  border: none;
952 970
}
953 971

  
972
a.button-orange:hover,
954 973
#edit-cancel:hover,
955 974
#edit-actions-cancel:hover,
956 975
input#edit-buttons-revert:hover,
......
959 978
  box-shadow: 0 2px 6px rgba(0,0,0,.3);
960 979
}
961 980

  
981
a.button-orange:active,
962 982
#edit-cancel:active,
963 983
#edit-actions-cancel:active,
964 984
input#edit-buttons-revert:active,
......
970 990
  box-shadow: inset 0 0px 8px rgba(0,0,0,0.4);
971 991
}
972 992

  
993
a.button-orange:focus,
973 994
#edit-cancel:focus,
974 995
#edit-actions-cancel:focus,
975 996
input#edit-buttons-revert:focus,
......
1119 1140
  border-bottom: none;
1120 1141
}
1121 1142

  
1143
body.sticky-actions.adminimal-skin-material .ajax-new-content .form-actions.form-wrapper {
1144
  padding: 0;
1145
  box-shadow: none;
1146
}
1147

  
1122 1148
body.sticky-actions.adminimal-skin-material #page {
1123 1149
  margin-bottom: 80px;
1124 1150
}
drupal7/sites/all/themes/adminimal_theme/template.php
22 22
 */
23 23
function adminimal_preprocess_html(&$vars) {
24 24

  
25
  // watchdog('Emergency', 'This is a test emergency watchdog mesage' , NULL , WATCHDOG_EMERGENCY);
26
  // watchdog('Info', 'This is a test info watchdog mesage' , NULL , WATCHDOG_INFO);
27
  // watchdog('Info', 'This is a test info watchdog mesage' , NULL , WATCHDOG_INFO);
28
  // watchdog('Debug', 'This is a test debug watchdog mesage' , NULL , WATCHDOG_DEBUG);
29
  // watchdog('Notice', 'This is a test notice watchdog mesage' , NULL , WATCHDOG_NOTICE);
30
  // watchdog('Info', 'This is a test info watchdog mesage' , NULL , WATCHDOG_INFO);
31
  // watchdog('Info', 'This is a test info watchdog mesage' , NULL , WATCHDOG_INFO);
32
  // watchdog('Warning', 'This is a test warning watchdog mesage' , NULL , WATCHDOG_WARNING);
33
  // watchdog('Debug', 'This is a test debug watchdog mesage' , NULL , WATCHDOG_DEBUG);
34
  // watchdog('Info', 'This is a test info watchdog mesage' , NULL , WATCHDOG_INFO);
35
  // watchdog('Error', 'This is a test error watchdog mesage' , NULL , WATCHDOG_ERROR);
36
  // watchdog('Info', 'This is a test info watchdog mesage' , NULL , WATCHDOG_INFO);
37
  // watchdog('Info', 'This is a test info watchdog mesage' , NULL , WATCHDOG_INFO);
38
  // watchdog('Info', 'This is a test info watchdog mesage' , NULL , WATCHDOG_INFO);
39
  // watchdog('Info', 'This is a test info watchdog mesage' , NULL , WATCHDOG_INFO);
40
  // watchdog('Notice', 'This is a test notice watchdog mesage' , NULL , WATCHDOG_NOTICE);
41
  // watchdog('Info', 'This is a test info watchdog mesage' , NULL , WATCHDOG_INFO);
42
  // watchdog('Info', 'This is a test info watchdog mesage' , NULL , WATCHDOG_INFO);
43
  // watchdog('Debug', 'This is a test debug watchdog mesage' , NULL , WATCHDOG_DEBUG);
44
  // watchdog('Info', 'This is a test info watchdog mesage' , NULL , WATCHDOG_INFO);
45
  // watchdog('Info', 'This is a test info watchdog mesage' , NULL , WATCHDOG_INFO);
46
  // watchdog('Info', 'This is a test info watchdog mesage' , NULL , WATCHDOG_INFO);
47
  // watchdog('Notice', 'This is a test notice watchdog mesage' , NULL , WATCHDOG_NOTICE);
48
  // watchdog('Critical', 'This is a test critical watchdog mesage' , NULL , WATCHDOG_CRITICAL);
49
  // watchdog('Info', 'This is a test info watchdog mesage' , NULL , WATCHDOG_INFO);
50
  // watchdog('Info', 'This is a test info watchdog mesage' , NULL , WATCHDOG_INFO);
51
  // watchdog('Info', 'This is a test info watchdog mesage' , NULL , WATCHDOG_INFO);
52
  // watchdog('Alert', 'This is a test alert watchdog mesage' , NULL , WATCHDOG_ALERT);
53
  // watchdog('Info', 'This is a test info watchdog mesage' , NULL , WATCHDOG_INFO);
54
  // watchdog('Info', 'This is a test info watchdog mesage' , NULL , WATCHDOG_INFO);
55
  // watchdog('Debug', 'This is a test debug watchdog mesage' , NULL , WATCHDOG_DEBUG);
56
  // watchdog('Info', 'This is a test info watchdog mesage' , NULL , WATCHDOG_INFO);
57
  // watchdog('Notice', 'This is a test notice watchdog mesage' , NULL , WATCHDOG_NOTICE);
58
  // watchdog('Debug', 'This is a test debug watchdog mesage' , NULL , WATCHDOG_DEBUG);
59
  // watchdog('Info', 'This is a test info watchdog mesage' , NULL , WATCHDOG_INFO);
60

  
61

  
62 25
  // Get adminimal folder path.
63 26
  $adminimal_path = drupal_get_path('theme', 'adminimal');
64 27

  
......
150 113
  drupal_add_css($adminimal_path . '/css/tablet.css', array('group' => CSS_THEME, 'media' => $media_query_tablet, 'weight' => 1000));
151 114

  
152 115
  // Add custom CSS.
153
  $custom_css_path = 'public://adminimal-custom.css';
154
  if (theme_get_setting('custom_css') && file_exists($custom_css_path)) {
155
    drupal_add_css($custom_css_path, array('group' => CSS_THEME, 'weight' => 9999, 'preprocess' => TRUE));
116
  if (theme_get_setting('custom_css')) {
117
    $custom_css_path = theme_get_setting('custom_css_path');
118
    if (empty($custom_css_path)) {
119
      $custom_css_path = 'public://adminimal-custom.css';
120
    }
121
    if (file_exists($custom_css_path)) {
122
      drupal_add_css($custom_css_path, array(
123
        'group' => CSS_THEME,
124
        'weight' => 9999,
125
        'preprocess' => TRUE,
126
      ));
127
    }
156 128
  }
157 129

  
158 130
  // Fix the viewport and zooming in mobile devices.
drupal7/sites/all/themes/adminimal_theme/theme-settings.php
19 19
  global $base_url;
20 20
  $adminimal_path = drupal_get_path('theme', 'adminimal');
21 21
  $old_css_path = $adminimal_path . '/css/custom.css';
22
  $custom_css_path = 'public://adminimal-custom.css';
22
  $custom_css_path = theme_get_setting('custom_css_path');
23
  if (empty($custom_css_path)) {
24
    $custom_css_path = 'public://adminimal-custom.css';
25
  }
23 26
  $custom_css_dir = str_replace($base_url . '/', "", file_create_url($custom_css_path));
24 27
  $custom_css_url = file_create_url($custom_css_path);
25 28

  
......
152 155

  
153 156
  $form['adminimal_custom']['custom_css'] = array(
154 157
    '#type' => 'checkbox',
155
    '#title' => t('Use "adminimal-custom.css"'),
156
    '#description' => t('Include adminimal-custom.css file to override or add custom css code without subthememing/hacking Adminimal Theme.'),
158
    '#title' => t('Extend Adminimal with Custom CSS.'),
159
    '#description' => t('Include custom css file to override or add custom css code without subthememing/hacking Adminimal Theme.'),
157 160
    '#default_value' => theme_get_setting('custom_css'),
158 161
  );
159 162

  
160
  $form['adminimal_custom']['adminimal_custom_check'] = array(
163
  $form['adminimal_custom']['adminimal_custom'] = array(
161 164
    '#type' => 'fieldset',
162
    '#title' => t('Custom CSS file check'),
165
    '#title' => t('Custom CSS file'),
166
    '#description' => t('The file will be created, if not found, after saving.'),
163 167
    '#weight' => 50,
164 168
    '#states' => array(
165
      // Hide the settings when the cancel notify checkbox is disabled.
169
      // Hide the settings when the custom css checkbox is disabled.
166 170
      'visible' => array(
167
       ':input[name="custom_css"]' => array('checked' => TRUE),
171
        ':input[name="custom_css"]' => array('checked' => TRUE),
168 172
      ),
169
     ),
173
    ),
170 174
  );
171 175

  
172 176
  if (file_exists($custom_css_path)) {
173
    $form['adminimal_custom']['adminimal_custom_check']['custom_css_description'] = array(
174
      '#markup' => t('Custom CSS file Found in: !css', array('!css' => "<span class='css_path'>" . $custom_css_dir . "</span>")),
177
    $form['adminimal_custom']['adminimal_custom']['custom_css_description'] = array(
178
      '#markup' => t('Custom CSS file found in: !css', array('!css' => '<span class="css_path">' . $custom_css_dir . '</span>')),
175 179
      '#prefix' => '<div class="messages status custom_css_found">',
176 180
      '#suffix' => '</div>',
177 181
    );
178 182
  }
179 183
  else {
180
    $form['adminimal_custom']['adminimal_custom_check']['custom_css_not_found'] = array(
181
      '#markup' => t('Custom CSS file not found. You must create the !css file manually.', array('!css' => "<span class='css_path'>" . $custom_css_dir . "</span>")),
184
    $form['adminimal_custom']['adminimal_custom']['custom_css_not_found'] = array(
185
      '#markup' => t('Custom CSS file not found. You must create the !css file manually.', array('!css' => '<span class="css_path">' . $custom_css_dir . '</span>')),
182 186
      '#prefix' => '<div class="messages error custom_css_not_found">',
183 187
      '#suffix' => '</div>',
184 188
    );
185 189
  }
190

  
191
  $form['adminimal_custom']['adminimal_custom']['custom_css_path'] = array(
192
    '#type' => 'textfield',
193
    '#title' => t('Custom CSS path'),
194
    '#description' => t('<b>Leave blank to use the default path (public://adminimal-custom.css)</b>. Can be a filepath of URI'),
195
    '#default_value' => theme_get_setting('custom_css_path'),
196
  );
186 197
}

Formats disponibles : Unified diff