diff --git a/core/modules/node/images/btn-arrow-preview.png b/core/modules/node/images/btn-arrow-preview.png new file mode 100644 index 0000000..3da4a58 --- /dev/null +++ b/core/modules/node/images/btn-arrow-preview.png @@ -0,0 +1,5 @@ +PNG + + IHDR +|90tEXtSoftwareAdobe ImageReadyqe<iTXtXML:com.adobe.xmp ! +IDATxb?2n`aF ĵ,P= A|WXx١0]L,e@<;?{kJVuSZS|32BE5s#ai] 0destination)) { $form['node_destination'] = array( - '#type' => 'hidden', + '#type' => 'value', '#value' => $node->destination, ); } @@ -400,7 +400,8 @@ public function preview(array $form, array &$form_state) { $entity = $this->getEntity($form_state); $entity->in_preview = TRUE; - // In case the destination parameter is set + // In case the destination parameter is set, store it on the entity + // and unset $_GET['destination'] so we aren't redirected. if (isset($_GET['destination'])) { $entity->destination = $_GET['destination']; unset($_GET['destination']); diff --git a/core/modules/node/node.preview.css b/core/modules/node/node.preview.css index 1b9270a..17ada0d 100644 --- a/core/modules/node/node.preview.css +++ b/core/modules/node/node.preview.css @@ -1,18 +1,28 @@ .node-preview-container { - background-color: #cee5f3; + background: #1078d4; + background-image: -webkit-linear-gradient(top, #d1e8f5, #d3e8f4); + background-image: -moz-linear-gradient(top, #d1e8f5, #d3e8f4); + background-image: -o-linear-gradient(top, #d1e8f5, #d3e8f4); + background-image: linear-gradient(to bottom, #d1e8f5, #d3e8f4); + -webkit-box-shadow: 0 1px 3px 1px rgba(0, 0, 0, 0.3333); + box-shadow: 0 1px 3px 1px rgba(0, 0, 0, 0.3333); position: fixed; z-index: 499; width: 100%; padding: 10px; } +.node-preview-container .form-type-select { + margin-left: 25%; +} + .button-action { - background: #1078d4; - background-image: -webkit-linear-gradient(top, #419ff1, #1076d5); - background-image: -moz-linear-gradient(top, #419ff1, #1076d5); - background-image: -o-linear-gradient(top, #419ff1, #1076d5); - background-image: linear-gradient(to bottom, #419ff1, #1076d5); + background: #4f9fea; + background-image: -webkit-linear-gradient(top, #4f9fea, #4481dc); + background-image: -moz-linear-gradient(top, #4f9fea, #4481dc); + background-image: -o-linear-gradient(top, #4f9fea, #4481dc); + background-image: linear-gradient(to bottom, #4f9fea, #4481dc); border: 1px solid #0048c8; border-radius: .4em; -webkit-box-shadow: inset 0 1px 0 rgba(255, 255, 255, .4); @@ -21,9 +31,21 @@ font-size: 1em; line-height: normal; margin: 0; - padding: 4px 1em; - text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.5); + padding: 4px 1em 4px 0.6em; + text-shadow: 1px 1px 0 rgba(0, 0, 0, 0.5); } + +.button-action::before { + content: ''; + display: inline-block; + width: 10px; + height: 10px; + background-image: url('images/btn-arrow-preview.png'); + background-position: 0px 1px; + background-repeat: no-repeat; + +} + .button-action:focus, .button-action:hover { background-color: #419cf1; diff --git a/core/modules/node/node.preview.js b/core/modules/node/node.preview.js index be0f0cb..5199a62 100644 --- a/core/modules/node/node.preview.js +++ b/core/modules/node/node.preview.js @@ -8,16 +8,16 @@ */ Drupal.behaviors.nodePreviewDestroyLinks = { attach: function (context) { - var $preview = $(context).find('.node').once('node-preview'); + var $preview = $(context).find('.page-node-preview').once('node-preview'); if ($preview.length) { - $preview.on('click.preview', 'a:not([href^=#])', function (e) { + $preview.on('click.preview', 'a:not([href^=#],#edit-backlink)', function (e) { e.preventDefault(); }); } }, detach: function (context, settings, trigger) { if (trigger === 'unload') { - var $preview = $(context).find('.node').removeOnce('node-preview'); + var $preview = $(context).find('.page-node-preview').removeOnce('node-preview'); if ($preview.length) { $preview.off('click.preview'); } diff --git a/core/modules/taxonomy/taxonomy.module b/core/modules/taxonomy/taxonomy.module index bad8286..200d66d 100644 --- a/core/modules/taxonomy/taxonomy.module +++ b/core/modules/taxonomy/taxonomy.module @@ -956,7 +956,7 @@ function taxonomy_implode_tags($tags, $vid = NULL) { } // Extract terms belonging to the vocabulary in question. else if (!isset($vid) || $tag->bundle() == $vid) { - // Make sure we have a completed loaded taxonomy term. + // Make sure we have a complete loaded taxonomy term. if ($tag instanceof EntityInterface) { $label = $tag->label(); }