Merge branch '1400748-namespaces' into dbtngtng
Larry Garfield
commit
e9453d8b04
|
|
@ -333,9 +333,9 @@ class Schema extends DatabaseSchema {
|
|||
// rename them when renaming the table.
|
||||
$indexes = $this->connection->query('SELECT indexname FROM pg_indexes WHERE schemaname = :schema AND tablename = :table', array(':schema' => $old_schema, ':table' => $old_table_name));
|
||||
foreach ($indexes as $index) {
|
||||
if (preg_match('/^' . preg_quote($old_full_name) . '_(.*)_idx$/', $index->indexname, $matches)) {
|
||||
if (preg_match('/^' . preg_quote($old_full_name) . '_(.*)$/', $index->indexname, $matches)) {
|
||||
$index_name = $matches[1];
|
||||
$this->connection->query('ALTER INDEX ' . $index->indexname . ' RENAME TO {' . $new_name . '}_' . $index_name . '_idx');
|
||||
$this->connection->query('ALTER INDEX ' . $index->indexname . ' RENAME TO {' . $new_name . '}_' . $index_name);
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -984,6 +984,7 @@ function hook_ranking() {
|
|||
* The node type object that is being created.
|
||||
*/
|
||||
function hook_node_type_insert($info) {
|
||||
drupal_set_message(t('You have just created a content type with a machine name %type.', array('%type' => $info->type)));
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
|
|||
|
|
@ -1,35 +1,35 @@
|
|||
|
||||
div#toolbar a#edit-shortcuts {
|
||||
#toolbar #edit-shortcuts {
|
||||
position: absolute;
|
||||
left: 0;
|
||||
top: 0;
|
||||
padding: 5px 5px 5px 10px;
|
||||
}
|
||||
div#toolbar div.toolbar-shortcuts ul {
|
||||
#toolbar .toolbar-shortcuts ul {
|
||||
float: none;
|
||||
margin-right: 5px;
|
||||
margin-left: 10em;
|
||||
}
|
||||
div#toolbar div.toolbar-shortcuts ul li a {
|
||||
#toolbar .toolbar-shortcuts ul li a {
|
||||
margin-left: 5px;
|
||||
margin-right: 0;
|
||||
padding: 0 5px;
|
||||
}
|
||||
div#toolbar div.toolbar-shortcuts span.icon {
|
||||
#toolbar .toolbar-shortcuts span.icon {
|
||||
float: right;
|
||||
}
|
||||
div.add-or-remove-shortcuts a span.icon {
|
||||
.add-or-remove-shortcuts a span.icon {
|
||||
float: right;
|
||||
margin-right: 8px;
|
||||
margin-left: 0;
|
||||
}
|
||||
div.add-or-remove-shortcuts a span.text {
|
||||
.add-or-remove-shortcuts a span.text {
|
||||
float: right;
|
||||
padding-right: 10px;
|
||||
padding-left: 0;
|
||||
}
|
||||
div.add-or-remove-shortcuts a:focus span.text,
|
||||
div.add-or-remove-shortcuts a:hover span.text {
|
||||
.add-or-remove-shortcuts a:focus span.text,
|
||||
.add-or-remove-shortcuts a:hover span.text {
|
||||
-moz-border-radius: 5px 0 0 5px;
|
||||
-webkit-border-top-left-radius: 5px;
|
||||
-webkit-border-bottom-left-radius: 5px;
|
||||
|
|
@ -40,9 +40,9 @@ div.add-or-remove-shortcuts a:hover span.text {
|
|||
padding-right: 17px;
|
||||
padding-left: 0;
|
||||
}
|
||||
div.add-shortcut a:hover span.icon {
|
||||
.add-shortcut a:hover span.icon {
|
||||
background-position: 0 -24px;
|
||||
}
|
||||
div.remove-shortcut a:hover span.icon {
|
||||
.remove-shortcut a:hover span.icon {
|
||||
background-position: -12px -24px;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,17 +1,17 @@
|
|||
div#toolbar a#edit-shortcuts {
|
||||
#toolbar #edit-shortcuts {
|
||||
float: right;
|
||||
padding: 5px 10px 5px 5px;
|
||||
line-height: 24px;
|
||||
color: #fefefe;
|
||||
}
|
||||
div#toolbar a#edit-shortcuts:focus,
|
||||
div#toolbar a#edit-shortcuts:hover,
|
||||
div#toolbar a#edit-shortcuts.active {
|
||||
#toolbar #edit-shortcuts:focus,
|
||||
#toolbar #edit-shortcuts:hover,
|
||||
#toolbar #edit-shortcuts.active {
|
||||
color: #fff;
|
||||
text-decoration: underline;
|
||||
}
|
||||
|
||||
div#toolbar div.toolbar-shortcuts ul {
|
||||
#toolbar .toolbar-shortcuts ul {
|
||||
padding: 5px 0 2px 0;
|
||||
height: 28px;
|
||||
line-height: 24px;
|
||||
|
|
@ -19,7 +19,7 @@ div#toolbar div.toolbar-shortcuts ul {
|
|||
margin-left:5px; /* LTR */
|
||||
}
|
||||
|
||||
div#toolbar div.toolbar-shortcuts ul li a {
|
||||
#toolbar .toolbar-shortcuts ul li a {
|
||||
padding: 0 5px 0 5px;
|
||||
margin-right: 5px; /* LTR */
|
||||
-moz-border-radius: 5px;
|
||||
|
|
@ -27,18 +27,18 @@ div#toolbar div.toolbar-shortcuts ul li a {
|
|||
border-radius: 5px;
|
||||
}
|
||||
|
||||
div#toolbar div.toolbar-shortcuts ul li a:focus,
|
||||
div#toolbar div.toolbar-shortcuts ul li a:hover,
|
||||
div#toolbar div.toolbar-shortcuts ul li a.active:focus {
|
||||
#toolbar .toolbar-shortcuts ul li a:focus,
|
||||
#toolbar .toolbar-shortcuts ul li a:hover,
|
||||
#toolbar .toolbar-shortcuts ul li a.active:focus {
|
||||
background: #555;
|
||||
}
|
||||
|
||||
div#toolbar div.toolbar-shortcuts ul li a.active:hover,
|
||||
div#toolbar div.toolbar-shortcuts ul li a.active {
|
||||
#toolbar .toolbar-shortcuts ul li a.active:hover,
|
||||
#toolbar .toolbar-shortcuts ul li a.active {
|
||||
background: #000;
|
||||
}
|
||||
|
||||
div#toolbar div.toolbar-shortcuts span.icon {
|
||||
#toolbar .toolbar-shortcuts span.icon {
|
||||
float: left; /* LTR */
|
||||
background: #444;
|
||||
width: 30px;
|
||||
|
|
@ -49,11 +49,11 @@ div#toolbar div.toolbar-shortcuts span.icon {
|
|||
border-radius: 5px;
|
||||
}
|
||||
|
||||
div.add-or-remove-shortcuts {
|
||||
.add-or-remove-shortcuts {
|
||||
padding-top: 5px;
|
||||
}
|
||||
|
||||
div.add-or-remove-shortcuts a span.icon {
|
||||
.add-or-remove-shortcuts a span.icon {
|
||||
display: block;
|
||||
width: 12px;
|
||||
background: transparent url(shortcut.png) no-repeat scroll 0 0;
|
||||
|
|
@ -62,26 +62,26 @@ div.add-or-remove-shortcuts a span.icon {
|
|||
margin-left:8px;
|
||||
}
|
||||
|
||||
div.add-shortcut a:focus span.icon,
|
||||
div.add-shortcut a:hover span.icon {
|
||||
.add-shortcut a:focus span.icon,
|
||||
.add-shortcut a:hover span.icon {
|
||||
background-position: 0 -12px;
|
||||
}
|
||||
div.remove-shortcut a span.icon {
|
||||
.remove-shortcut a span.icon {
|
||||
background-position: -12px 0;
|
||||
}
|
||||
div.remove-shortcut a:focus span.icon,
|
||||
div.remove-shortcut a:hover span.icon {
|
||||
.remove-shortcut a:focus span.icon,
|
||||
.remove-shortcut a:hover span.icon {
|
||||
background-position: -12px -12px;
|
||||
}
|
||||
|
||||
div.add-or-remove-shortcuts a span.text {
|
||||
.add-or-remove-shortcuts a span.text {
|
||||
float: left;
|
||||
padding-left:10px;
|
||||
display: none;
|
||||
}
|
||||
|
||||
div.add-or-remove-shortcuts a:focus span.text,
|
||||
div.add-or-remove-shortcuts a:hover span.text {
|
||||
.add-or-remove-shortcuts a:focus span.text,
|
||||
.add-or-remove-shortcuts a:hover span.text {
|
||||
font-size: 10px;
|
||||
line-height: 12px;
|
||||
color: #fff;
|
||||
|
|
|
|||
|
|
@ -2874,14 +2874,11 @@ function hook_install() {
|
|||
*
|
||||
* A good rule of thumb is to remove updates older than two major releases of
|
||||
* Drupal. See hook_update_last_removed() to notify Drupal about the removals.
|
||||
* For further information about releases and release numbers see:
|
||||
* @link http://drupal.org/node/711070 Maintaining a drupal.org project with Git @endlink
|
||||
*
|
||||
* Never renumber update functions.
|
||||
*
|
||||
* Further information about releases and release numbers:
|
||||
* - @link http://drupal.org/handbook/version-info http://drupal.org/handbook/version-info @endlink
|
||||
* - @link http://drupal.org/node/93999 http://drupal.org/node/93999 @endlink (Overview of contributions branches and tags)
|
||||
* - @link http://drupal.org/handbook/cvs/releases http://drupal.org/handbook/cvs/releases @endlink
|
||||
*
|
||||
* Implementations of this hook should be placed in a mymodule.install file in
|
||||
* the same directory as mymodule.module. Drupal core's updates are implemented
|
||||
* using the system module as a name and stored in database/updates.inc.
|
||||
|
|
|
|||
|
|
@ -2911,7 +2911,18 @@ function confirm_form($form, $question, $path, $description = NULL, $yes = NULL,
|
|||
}
|
||||
|
||||
/**
|
||||
* Determines if the current user is in compact mode.
|
||||
* Determines whether the current user is in compact mode.
|
||||
*
|
||||
* Compact mode shows certain administration pages with less description text,
|
||||
* such as the configuration page and the permissions page.
|
||||
*
|
||||
* Whether the user is in compact mode is determined by a cookie, which is set
|
||||
* for the user by system_admin_compact_page().
|
||||
*
|
||||
* If the user does not have the cookie, the default value is given by the
|
||||
* system variable 'admin_compact_mode', which itself defaults to FALSE. This
|
||||
* does not have a user interface to set it: it is a hidden variable which can
|
||||
* be set in the settings.php file.
|
||||
*
|
||||
* @return
|
||||
* TRUE when in compact mode, FALSE when in expanded mode.
|
||||
|
|
|
|||
|
|
@ -21,7 +21,7 @@
|
|||
* @see template_preprocess_toolbar()
|
||||
*/
|
||||
?>
|
||||
<div id="toolbar" class="<?php print $classes; ?> clearfix">
|
||||
<nav id="toolbar" role="navigation" class="<?php print $classes; ?> clearfix">
|
||||
<div class="toolbar-menu clearfix">
|
||||
<?php print render($toolbar['toolbar_home']); ?>
|
||||
<?php print render($toolbar['toolbar_user']); ?>
|
||||
|
|
@ -32,4 +32,4 @@
|
|||
</div>
|
||||
|
||||
<?php print render($toolbar['toolbar_drawer']); ?>
|
||||
</div>
|
||||
</nav>
|
||||
|
|
|
|||
|
|
@ -1,48 +0,0 @@
|
|||
|
||||
fieldset legend {
|
||||
left: 6px;
|
||||
}
|
||||
ul.action-links li a,
|
||||
#user-login-form li.openid-link a,
|
||||
#user-login li.openid-link a {
|
||||
zoom: 1;
|
||||
}
|
||||
.comment .attribution {
|
||||
float: right;
|
||||
}
|
||||
.comment .comment-arrow {
|
||||
position: absolute;
|
||||
right: 25px;
|
||||
}
|
||||
.region-header .block,
|
||||
.region-header #block-user-login .form-item {
|
||||
float: none;
|
||||
display: inline;
|
||||
vertical-align: top;
|
||||
}
|
||||
.region-header #block-user-login .item-list li {
|
||||
float: none;
|
||||
}
|
||||
.region-header #block-user-login .item-list li.last {
|
||||
padding-right: 0;
|
||||
}
|
||||
#user-login-form li.openid-link a,
|
||||
#user-login li.openid-link a {
|
||||
background-position: right -3px;
|
||||
padding-right: 20px;
|
||||
zoom: 1;
|
||||
}
|
||||
#main-menu ul.links li {
|
||||
margin: 0;
|
||||
}
|
||||
#main-menu ul.links li,
|
||||
#main-menu ul.links li a {
|
||||
display: inline;
|
||||
float: none;
|
||||
margin: 0;
|
||||
zoom: 1;
|
||||
}
|
||||
#footer li {
|
||||
display: inline;
|
||||
float: none;
|
||||
}
|
||||
|
|
@ -1,63 +0,0 @@
|
|||
|
||||
.block {
|
||||
zoom: 1;
|
||||
}
|
||||
#password-strength-text {
|
||||
margin-top: 0;
|
||||
}
|
||||
fieldset legend {
|
||||
left: -8px;
|
||||
padding: 0;
|
||||
}
|
||||
#footer-wrapper #footer .block {
|
||||
height: 100%;
|
||||
}
|
||||
.comment .attribution {
|
||||
display: inline-block;
|
||||
position: relative;
|
||||
float: left; /* LTR */
|
||||
overflow: hidden;
|
||||
}
|
||||
.comment .comment-text {
|
||||
display: inline-block;
|
||||
width: auto;
|
||||
}
|
||||
#search-block-form input.form-submit,
|
||||
#search-form input.form-submit {
|
||||
text-transform: capitalize; /* Trigger text indent. */
|
||||
height: 26px;
|
||||
}
|
||||
.meta {
|
||||
margin-bottom: 10px;
|
||||
}
|
||||
.region-header .form-required {
|
||||
color: #eee;
|
||||
}
|
||||
#search-block-form input.form-submit:hover,
|
||||
#search-block-form input.form-submit:focus,
|
||||
#search-form input.form-submit:hover,
|
||||
#search-form input.form-submit:focus {
|
||||
background-position: center -25px;
|
||||
}
|
||||
.contact-form #edit-message {
|
||||
width: 75%;
|
||||
}
|
||||
.contact-form .resizable-textarea .grippie {
|
||||
width: 76.3%;
|
||||
}
|
||||
#footer li {
|
||||
float: left; /* LTR */
|
||||
}
|
||||
#footer-wrapper {
|
||||
color: #c0c0c0;
|
||||
}
|
||||
#footer-wrapper a {
|
||||
color: #fcfcfc;
|
||||
}
|
||||
#footer-wrapper a:hover,
|
||||
#footer-wrapper a:focus {
|
||||
color: #fefefe;
|
||||
}
|
||||
.node-teaser {
|
||||
margin-top: 10px;
|
||||
}
|
||||
|
|
@ -20,9 +20,6 @@ function bartik_preprocess_html(&$variables) {
|
|||
|| !empty($variables['page']['footer_fourthcolumn'])) {
|
||||
$variables['classes_array'][] = 'footer-columns';
|
||||
}
|
||||
|
||||
// Add conditional stylesheets for IE
|
||||
drupal_add_css(path_to_theme() . '/css/ie.css', array('group' => CSS_THEME, 'browsers' => array('IE' => 'lte IE 7', '!IE' => FALSE), 'preprocess' => FALSE));
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
|
|||
Loading…
Reference in New Issue