Commit 2432c021 authored by alexpott's avatar alexpott

Issue #1987066 by Kevin Morse, JohnAlbin, rteijeiro, echoz, ry5n: Rename files...

Issue #1987066 by Kevin Morse, JohnAlbin, rteijeiro, echoz, ry5n: Rename files to match CSS file naming convention.
parent da63eafb
......@@ -3475,7 +3475,7 @@ function drupal_aggregate_js(&$js_groups) {
* @code
* $build['#attached'] = array(
* 'library' => array(array('taxonomy', 'taxonomy')),
* 'css' => array(drupal_get_path('module', 'taxonomy') . '/taxonomy.css'),
* 'css' => array(drupal_get_path('module', 'taxonomy') . '/css/taxonomy.module.css'),
* );
* @endcode
*
......
......@@ -95,10 +95,10 @@ function _drupal_maintenance_theme() {
// These are usually added from system_init() -except maintenance.css.
// When the database is inactive it's not called so we add it here.
$path = drupal_get_path('module', 'system');
drupal_add_css($path . '/system.base.css');
drupal_add_css($path . '/system.admin.css');
drupal_add_css($path . '/system.theme.css');
drupal_add_css($path . '/system.maintenance.css');
drupal_add_css($path . '/css/system.module.css');
drupal_add_css($path . '/css/system.theme.css');
drupal_add_css($path . '/css/system.admin.css');
drupal_add_css($path . '/css/system.maintenance.css');
}
/**
......
......@@ -16,7 +16,7 @@
function block_admin_demo($theme = NULL) {
return array(
'#attached' => array(
'css' => array(drupal_get_path('module', 'block') . '/block.admin.css'),
'css' => array(drupal_get_path('module', 'block') . '/css/block.admin.css'),
),
);
}
......@@ -86,4 +86,3 @@ function block_admin_edit(Block $entity) {
return entity_get_form($entity);
}
......@@ -106,7 +106,7 @@ public function getFormID() {
*/
public function buildForm(array $form, array &$form_state) {
$entities = $this->load();
$form['#attached']['css'][] = drupal_get_path('module', 'block') . '/block.admin.css';
$form['#attached']['css'][] = drupal_get_path('module', 'block') . '/css/block.admin.css';
$form['#attached']['library'][] = array('system', 'drupal.tableheader');
$form['#attached']['library'][] = array('block', 'drupal.block');
......
......@@ -322,7 +322,7 @@ function book_form_node_form_alter(&$form, &$form_state, $form_id) {
'#submit' => array('book_pick_book_nojs_submit'),
'#weight' => 20,
'#attached' => array(
'css' => array(drupal_get_path('module', 'book') . '/book.admin.css'),
'css' => array(drupal_get_path('module', 'book') . '/css/book.admin.css'),
),
);
}
......@@ -986,7 +986,7 @@ function template_preprocess_book_all_books_block(&$variables) {
* Properties used: bid, link_title, depth, plid, mlid.
*/
function template_preprocess_book_navigation(&$variables) {
drupal_add_css(drupal_get_path('module', 'book') . '/book.theme.css');
drupal_add_css(drupal_get_path('module', 'book') . '/css/book.theme.css');
$book_link = $variables['book_link'];
// Provide extra variables for themers. Not needed by default.
......
......@@ -194,7 +194,7 @@ function color_scheme_form($complete_form, &$form_state, $theme) {
),
// Add custom CSS.
'css' => array(
$base . '/color.admin.css' => array(),
$base . '/css/color.admin.css' => array(),
),
// Add custom JavaScript.
'js' => array(
......
......@@ -31,7 +31,7 @@
#palette .down,
#palette .up,
#palette .both {
background: url(images/hook-rtl.png) no-repeat 0 0;
background: url(../images/hook-rtl.png) no-repeat 0 0;
}
#palette .up {
background-position: 0 -27px;
......
......@@ -45,7 +45,7 @@
#palette .down,
#palette .up,
#palette .both {
background: url(images/hook.png) no-repeat 100% 0; /* LTR */
background: url(../images/hook.png) no-repeat 100% 0; /* LTR */
}
#palette .up {
background-position: 100% -27px; /* LTR */
......@@ -61,7 +61,7 @@
left: -10px; /* LTR */
width: 20px;
height: 25px;
background: url(images/lock.png) no-repeat 50% 2px;
background: url(../images/lock.png) no-repeat 50% 2px;
cursor: pointer;
}
#palette .unlocked {
......
......@@ -86,7 +86,7 @@ protected function alterBuild(array &$build, EntityInterface $comment, EntityDis
// Add indentation div or close open divs as needed.
if ($is_threaded) {
$build['#attached']['css'][] = drupal_get_path('module', 'comment') . '/comment.theme.css';
$build['#attached']['css'][] = drupal_get_path('module', 'comment') . '/css/comment.theme.css';
$prefix .= $comment->divs <= 0 ? str_repeat('</div>', abs($comment->divs)) : "\n" . '<div class="indented">';
}
......
......@@ -63,7 +63,7 @@ public function __construct(StorageInterface $target_storage, StorageInterface $
*/
public function diff($config_file) {
// Add the CSS for the inline diff.
$output['#attached']['css'][] = drupal_get_path('module', 'system') . '/system.diff.css';
$output['#attached']['css'][] = drupal_get_path('module', 'system') . '/css/system.diff.css';
$diff = config_diff($this->targetStorage, $this->sourceStorage, $config_file);
$formatter = new \DrupalDiffFormatter();
......
......@@ -112,8 +112,8 @@ function contextual_library_info() {
$path . '/contextual.js' => array('group' => JS_LIBRARY, 'weight' => -2),
),
'css' => array(
$path . '/contextual.base.css' => array(),
$path . '/contextual.theme.css' => array(),
$path . '/css/contextual.module.css' => array(),
$path . '/css/contextual.theme.css' => array(),
),
'dependencies' => array(
array('system', 'jquery'),
......@@ -133,7 +133,7 @@ function contextual_library_info() {
$path . '/contextual.toolbar.js' => array('group' => JS_LIBRARY, 'weight' => -1),
),
'css' => array(
$path . '/contextual.toolbar.css' => array(),
$path . '/css/contextual.toolbar.css' => array(),
),
'dependencies' => array(
array('system', 'jquery'),
......
......@@ -27,7 +27,7 @@
.contextual .trigger {
background-attachment: scroll;
background-color: #fff;
background-image: url("../../misc/edit.png");
background-image: url(../../../misc/edit.png);
background-position: center center;
background-repeat: no-repeat;
background-size: 16px 16px;
......
......@@ -5,11 +5,11 @@
/* Tab icon. */
.icon-edit:before {
background-image: url("../../misc/edit.png");
background-image: url(../../../misc/edit.png);
}
.icon-edit:active:before,
.active.icon-edit:before {
background-image: url("../../misc/edit-active.png");
background-image: url(../../../misc/edit-active.png);
}
/* Tab appearance. */
......
......@@ -37,11 +37,11 @@
width: 16px;
}
.admin-dblog .dblog-warning .icon {
background-image: url(../../misc/message-16-warning.png);
background-image: url(../../../misc/message-16-warning.png);
}
.admin-dblog .dblog-error .icon,
.admin-dblog .dblog-critical .icon,
.admin-dblog .dblog-alert .icon,
.admin-dblog .dblog-emergency .icon {
background-image: url(../../misc/message-16-error.png);
background-image: url(../../../misc/message-16-error.png);
}
......@@ -88,7 +88,7 @@ function dblog_menu() {
*/
function dblog_page_build(&$page) {
if (arg(0) == 'admin' && arg(1) == 'reports') {
$page['#attached']['css'][] = drupal_get_path('module', 'dblog') . '/dblog.css';
$page['#attached']['css'][] = drupal_get_path('module', 'dblog') . '/css/dblog.module.css';
}
}
......
......@@ -90,7 +90,7 @@ function edit_library_info() {
$path . '/js/theme.js' => $options,
),
'css' => array(
$path . '/css/edit.css' => array(),
$path . '/css/edit.module.css' => array(),
),
'dependencies' => array(
array('system', 'jquery'),
......
......@@ -982,7 +982,7 @@ function field_extract_bundle($entity_type, $bundle) {
*/
function field_page_build(&$page) {
$path = drupal_get_path('module', 'field');
$page['#attached']['css'][$path . '/theme/field.css'] = array('every_page' => TRUE);
$page['#attached']['css'][$path . '/css/field.module.css'] = array('every_page' => TRUE);
}
/**
......@@ -1034,7 +1034,7 @@ function template_preprocess_field(&$variables, $hook) {
'field-label-' . $element['#label_display'],
);
// Add a "clearfix" class to the wrapper since we float the label and the
// field items in field.css if the label is inline.
// field items in field.module.css if the label is inline.
if ($element['#label_display'] == 'inline') {
$variables['attributes']['class'][] = 'clearfix';
}
......
......@@ -338,7 +338,7 @@ function field_ui_library_info() {
drupal_get_path('module', 'field_ui') . '/field_ui.js' => array(),
),
'css' => array(
drupal_get_path('module', 'field_ui') . '/field_ui.admin.css' => array(),
drupal_get_path('module', 'field_ui') . '/css/field_ui.admin.css' => array(),
),
'dependencies' => array(
array('system', 'jquery'),
......
......@@ -1651,7 +1651,7 @@ function file_library_info() {
drupal_get_path('module', 'file') . '/file.js' => array(),
),
'css' => array(
drupal_get_path('module', 'file') . '/file.admin.css'
drupal_get_path('module', 'file') . '/css/file.admin.css'
),
'dependencies' => array(
array('system', 'jquery'),
......
......@@ -31,7 +31,7 @@
margin: 0;
}
.filter-help a {
background: transparent url(../../misc/help.png) right center no-repeat; /* LTR */
background: transparent url(../../../misc/help.png) right center no-repeat; /* LTR */
padding: 0 20px 0 0; /* LTR */
}
......
......@@ -1439,7 +1439,7 @@ function filter_library_info() {
drupal_get_path('module', 'filter') . '/filter.admin.js' => array(),
),
'css' => array(
drupal_get_path('module', 'filter') . '/filter.admin.css'
drupal_get_path('module', 'filter') . '/css/filter.admin.css'
),
'dependencies' => array(
array('system', 'jquery'),
......@@ -1455,7 +1455,7 @@ function filter_library_info() {
drupal_get_path('module', 'filter') . '/filter.js' => array(),
),
'css' => array(
drupal_get_path('module', 'filter') . '/filter.admin.css'
drupal_get_path('module', 'filter') . '/css/filter.admin.css'
),
'dependencies' => array(
array('system', 'jquery'),
......
......@@ -16,7 +16,7 @@
white-space: nowrap;
}
#forum .icon{
background-image: url(../../misc/forum-icons.png);
background-image: url(../../../misc/forum-icons.png);
background-repeat: no-repeat;
float: left; /* LTR */
height: 24px;
......
......@@ -73,6 +73,6 @@ function forum_page($forum_term = NULL) {
'#sortby' => $sort_by,
'#forums_per_page' => $forum_per_page,
);
$build['#attached']['css'][] = drupal_get_path('module', 'forum') . '/forum.css';
$build['#attached']['css'][] = drupal_get_path('module', 'forum') . '/css/forum.module.css';
return $build;
}
......@@ -48,7 +48,7 @@ public static function create(ContainerInterface $container) {
public function helpMain() {
$output = array(
'#attached' => array(
'css' => array(drupal_get_path('module', 'help') . '/help.css'),
'css' => array(drupal_get_path('module', 'help') . '/css/help.module.css'),
),
'#markup' => '<h2>' . t('Help topics') . '</h2><p>' . t('Help is available on the following items:') . '</p>' . $this->helpLinksAsList(),
);
......
......@@ -67,7 +67,7 @@ public function testHelp() {
// Check for css on admin/help.
$this->drupalLogin($this->adminUser);
$this->drupalGet('admin/help');
$this->assertRaw(drupal_get_path('module', 'help') . '/help.css', 'The help.css file is present in the HTML.');
$this->assertRaw(drupal_get_path('module', 'help') . '/css/help.module.css', 'The help.module.css file is present in the HTML.');
// Verify that introductory help text exists, goes for 100% module coverage.
$this->assertRaw(t('For more information, refer to the specific topics listed in the next section or to the <a href="@drupal">online Drupal handbooks</a>.', array('@drupal' => 'http://drupal.org/documentation')), 'Help intro text correctly appears.');
......
......@@ -15,7 +15,7 @@ function image_style_list() {
$page['image_style_list'] = array(
'#markup' => theme('image_style_list', array('styles' => $styles)),
'#attached' => array(
'css' => array(drupal_get_path('module', 'image') . '/image.admin.css' => array()),
'css' => array(drupal_get_path('module', 'image') . '/css/image.admin.css' => array()),
),
);
......@@ -39,7 +39,7 @@ function image_style_form($form, &$form_state, $style) {
$form_state['image_style'] = $style;
$form['#tree'] = TRUE;
$form['#attached']['css'][drupal_get_path('module', 'image') . '/image.admin.css'] = array();
$form['#attached']['css'][drupal_get_path('module', 'image') . '/css/image.admin.css'] = array();
// Show the thumbnail preview.
$form['preview'] = array(
......@@ -297,7 +297,7 @@ function image_effect_form($form, &$form_state, $style, $effect) {
}
drupal_set_title($title, PASS_THROUGH);
$form['#attached']['css'][drupal_get_path('module', 'image') . '/image.admin.css'] = array();
$form['#attached']['css'][drupal_get_path('module', 'image') . '/css/image.admin.css'] = array();
$form['ieid'] = array(
'#type' => 'value',
......
......@@ -316,7 +316,7 @@ function image_field_widget_process($element, &$form_state, $form) {
$item['fids'] = $element['fids']['#value'];
$element['#theme'] = 'image_widget';
$element['#attached']['css'][] = drupal_get_path('module', 'image') . '/image.theme.css';
$element['#attached']['css'][] = drupal_get_path('module', 'image') . '/css/image.theme.css';
// Add the image preview.
if (!empty($element['#files']) && $element['#preview_image_style']) {
......
......@@ -805,7 +805,7 @@ function language_content_settings_form(array $form, array $form_state, array $s
$form = array(
'#labels' => $labels,
'#attached' => array(
'css' => array($path . '/language.admin.css'),
'css' => array($path . '/css/language.admin.css'),
),
);
......
......@@ -30,6 +30,6 @@ function layout_page_view($key) {
'#type' => 'markup',
'#markup' => $instance->renderLayout(TRUE, $regions),
);
$build['#attached']['css'][] = drupal_get_path('module', 'layout') . '/layout.admin.css';
$build['#attached']['css'][] = drupal_get_path('module', 'layout') . '/css/layout.admin.css';
return $build;
}
......@@ -66,12 +66,12 @@
vertical-align: top;
}
#locale-translation-status-form .expand .inner {
background: transparent url(../../misc/menu-collapsed.png) left .6em no-repeat;
background: transparent url(../../../misc/menu-collapsed.png) left .6em no-repeat;
margin-left: -12px;
padding-left: 12px;
}
#locale-translation-status-form .expanded .expand .inner {
background: transparent url(../../misc/menu-expanded.png) left .6em no-repeat;
background: transparent url(../../../misc/menu-expanded.png) left .6em no-repeat;
}
#locale-translation-status-form label {
......
......@@ -164,7 +164,7 @@ function locale_translate_filter_form($form, &$form_state) {
$filter_values = locale_translate_filter_values();
$form['#attached']['css'] = array(
drupal_get_path('module', 'locale') . '/locale.admin.css',
drupal_get_path('module', 'locale') . '/css/locale.admin.css',
);
$form['filters'] = array(
......@@ -261,7 +261,7 @@ function locale_translate_edit_form($form, &$form_state) {
$path = drupal_get_path('module', 'locale');
$form['#attached']['css'] = array(
$path . '/locale.admin.css',
$path . '/css/locale.admin.css',
);
$form['#attached']['library'][] = array('locale', 'drupal.locale.admin');
......@@ -584,7 +584,7 @@ function locale_translation_status_form($form, &$form_state) {
);
$form['#attached']['library'][] = array('locale', 'drupal.locale.admin');
$form['#attached']['css'] = array(drupal_get_path('module', 'locale') . '/locale.admin.css');
$form['#attached']['css'] = array(drupal_get_path('module', 'locale') . '/css/locale.admin.css');
$form['actions'] = array('#type' => 'actions');
if ($languages_update) {
......
......@@ -71,7 +71,7 @@ public function getOperations(EntityInterface $entity) {
*/
public function render() {
$build = parent::render();
$build['#attached']['css'][] = drupal_get_path('module', 'menu') . '/menu.admin.css';
$build['#attached']['css'][] = drupal_get_path('module', 'menu') . '/css/menu.admin.css';
return $build;
}
......
......@@ -71,7 +71,7 @@ function menu_overview_form($form, &$form_state) {
$form['#theme'] = 'menu_overview_form';
$form_state += array('menu_overview_form_parents' => array());
$form['#attached']['css'] = array(drupal_get_path('module', 'menu') . '/menu.admin.css');
$form['#attached']['css'] = array(drupal_get_path('module', 'menu') . '/css/menu.admin.css');
$links = array();
$query = Drupal::entityQuery('menu_link')
......
......@@ -300,7 +300,7 @@ function node_revision_overview($node) {
'#rows' => $rows,
'#header' => $header,
'#attached' => array (
'css' => array(drupal_get_path('module', 'node') . '/node.admin.css'),
'css' => array(drupal_get_path('module', 'node') . '/css/node.admin.css'),
),
);
......
......@@ -63,7 +63,7 @@
}
#overlay-close,
#overlay-close:hover {
background: #ffffff url(images/close.png) no-repeat;
background: #ffffff url(../images/close.png) no-repeat;
border-radius: 0 12px 12px 0; /* LTR */
display: block;
height: 26px;
......
......@@ -23,7 +23,7 @@ html.overlay-open body {
.overlay-modal-background {
/* Using a transparent png renders faster than using opacity */
background: transparent url(images/background.png) repeat;
background: transparent url(../images/background.png) repeat;
}
.overlay-element {
......
......@@ -140,7 +140,7 @@ function overlay_library_info() {
$module_path . '/overlay-parent.js' => array(),
),
'css' => array(
$module_path . '/overlay-parent.css' => array(),
$module_path . '/css/overlay-parent.css' => array(),
),
'dependencies' => array(
array('system', 'jquery'),
......@@ -162,7 +162,7 @@ function overlay_library_info() {
$module_path . '/overlay-child.js' => array(),
),
'css' => array(
$module_path . '/overlay-child.css' => array(),
$module_path . '/css/overlay-child.css' => array(),
),
'dependencies' => array(
array('system', 'jquery'),
......
......@@ -7,11 +7,11 @@
* Toolbar.
*/
.icon-shortcut:before {
background-image: url("images/shortcut.png");
background-image: url(../images/shortcut.png);
}
.icon-shortcut:active:before,
.icon-shortcut.active:before {
background-image: url("images/shortcut-active.png");
background-image: url(../images/shortcut-active.png);
}
.toolbar .tray.horizontal.shortcuts .menu {
float: left;
......@@ -31,7 +31,7 @@
* Add/remove links.
*/
.add-or-remove-shortcuts .icon {
background: transparent url(shortcut.png) no-repeat;
background: transparent url(../images/shortcut-add.png) no-repeat;
height: 12px;
margin-left: 8px; /* LTR */
overflow: hidden;
......
......@@ -524,8 +524,8 @@ function shortcut_preprocess_page(&$variables) {
$variables['title_suffix']['add_or_remove_shortcut'] = array(
'#attached' => array(
'css' => array(
drupal_get_path('module', 'shortcut') . '/shortcut.base.css',
drupal_get_path('module', 'shortcut') . '/shortcut.theme.css',
drupal_get_path('module', 'shortcut') . '/css/shortcut.module.css',
drupal_get_path('module', 'shortcut') . '/css/shortcut.theme.css',
),
),
'#prefix' => '<div class="add-or-remove-shortcuts ' . $link_mode . '-shortcut">',
......@@ -577,8 +577,8 @@ function shortcut_toolbar() {
'#weight' => -10,
'#attached' => array(
'css' => array(
drupal_get_path('module', 'shortcut') . '/shortcut.base.css',
drupal_get_path('module', 'shortcut') . '/shortcut.theme.css',
drupal_get_path('module', 'shortcut') . '/css/shortcut.module.css',
drupal_get_path('module', 'shortcut') . '/css/shortcut.theme.css',
),
),
);
......
......@@ -154,7 +154,7 @@ function simpletest_run_tests($test_list, $reporter = 'drupal') {
),
'finished' => '_simpletest_batch_finished',
'progress_message' => '',
'css' => array(drupal_get_path('module', 'simpletest') . '/simpletest.css'),
'css' => array(drupal_get_path('module', 'simpletest') . '/css/simpletest.module.css'),
'init_message' => t('Processing test @num of @max - %test.', array('%test' => $info['name'], '@num' => '1', '@max' => count($test_list))),
);
batch_set($batch);
......@@ -692,7 +692,7 @@ function simpletest_library_info() {
drupal_get_path('module', 'simpletest') . '/simpletest.js' => array(),
),
'css' => array(
drupal_get_path('module', 'simpletest') . '/simpletest.css' => array(),
drupal_get_path('module', 'simpletest') . '/css/simpletest.module.css' => array(),
),
'dependencies' => array(
array('system', 'jquery'),
......
......@@ -74,12 +74,12 @@ small .admin-link:after {
vertical-align: top;
}
#system-modules .expand .inner {
background: transparent url(../../misc/menu-collapsed.png) left .6em no-repeat;
background: transparent url(../../../misc/menu-collapsed.png) left .6em no-repeat;
margin-left: -12px;
padding-left: 12px;
}
#system-modules .expanded .expand .inner {
background: transparent url(../../misc/menu-expanded.png) left .6em no-repeat;
background: transparent url(../../../misc/menu-expanded.png) left .6em no-repeat;
}
#system-modules label {
color: #1d1d1d;
......@@ -150,13 +150,13 @@ a.module-link {
float: left; /* LTR */
}
a.module-link-help {
background: url(../../misc/help.png) 0 50% no-repeat; /* LTR */
background: url(../../../misc/help.png) 0 50% no-repeat; /* LTR */
}
a.module-link-permissions {
background: url(../../misc/permissions.png) 0 50% no-repeat; /* LTR */
background: url(../../../misc/permissions.png) 0 50% no-repeat; /* LTR */
}
a.module-link-configure {
background: url(../../misc/configure.png) 0 50% no-repeat; /* LTR */
background: url(../../../misc/configure.png) 0 50% no-repeat; /* LTR */
}
.module-help {
margin-left: 1em; /* LTR */
......@@ -183,10 +183,10 @@ table.system-status-report td.status-icon div {
width: 16px;
}
table.system-status-report tr.error td.status-icon div {
background-image: url(../../misc/message-16-error.png);
background-image: url(../../../misc/message-16-error.png);
}
table.system-status-report tr.warning td.status-icon div {
background-image: url(../../misc/message-16-warning.png);
background-image: url(../../../misc/message-16-warning.png);
}
table.system-status-report .status-title {
width: 25%;
......
......@@ -30,7 +30,7 @@
/* Animated throbber */
.js input.form-autocomplete {
background-image: url(../../misc/throbber.gif);
background-image: url(../../../misc/throbber.gif);
background-position: 100% 2px; /* LTR */
background-repeat: no-repeat;
}
......@@ -95,7 +95,7 @@ a.tabledrag-handle:hover {
text-decoration: none;
}
a.tabledrag-handle .handle {
background: url(../../misc/draggable.png) no-repeat 6px 9px;
background: url(../../../misc/draggable.png) no-repeat 6px 9px;
height: 13px;
margin: -0.4em 0.5em; /* LTR */