dinislage/PrestaShop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

// dashboard update version

Browse Source
This commit is contained in:
Kevin Granger
2013-09-18 17:10:48 +02:00
parent b71b594ca1
commit 806e628997
3 changed files with 20 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
admin-dev/themes/default/css/_dashboard.sass
+2 -2
View File
@@ -224,10 +224,10 @@
+opacity(1) +opacity(1)
+scale(1) +scale(1)
#new_version_container #dash_version
@extend .panel @extend .panel
padding: 0!important padding: 0!important
overflow: hidden overflow: hidden
iframe iframe
height: 120px height: 140px
width: 100% width: 100%
admin-dev/themes/default/css/admin-theme.css
+13 -13
View File
@@ -4387,7 +4387,7 @@ a.list-group-item:hover, a.list-group-item:focus {
line-height: 1.3; } line-height: 1.3; }
/* line 7, ../bower_components/sass-bootstrap/lib/_panels.scss */ /* line 7, ../bower_components/sass-bootstrap/lib/_panels.scss */
.panel, #header_notifs_icon_wrapper .notifs_panel, #new_version_container { .panel, #header_notifs_icon_wrapper .notifs_panel, #dash_version {
margin-bottom: 17px; margin-bottom: 17px;
background-color: white; background-color: white;
border: 1px solid transparent; border: 1px solid transparent;
@@ -4409,17 +4409,17 @@ a.list-group-item:hover, a.list-group-item:focus {
clear: both; } clear: both; }
/* line 28, ../bower_components/sass-bootstrap/lib/_panels.scss */ /* line 28, ../bower_components/sass-bootstrap/lib/_panels.scss */
.panel > .list-group, #header_notifs_icon_wrapper .notifs_panel > .list-group, #new_version_container > .list-group, #dashboard .panel > .data_list, #header_notifs_icon_wrapper #dashboard .notifs_panel > .data_list, #dashboard #header_notifs_icon_wrapper .notifs_panel > .data_list, #dashboard #new_version_container > .data_list { .panel > .list-group, #header_notifs_icon_wrapper .notifs_panel > .list-group, #dash_version > .list-group, #dashboard .panel > .data_list, #header_notifs_icon_wrapper #dashboard .notifs_panel > .data_list, #dashboard #header_notifs_icon_wrapper .notifs_panel > .data_list, #dashboard #dash_version > .data_list {
margin-bottom: 0; } margin-bottom: 0; }
/* line 31, ../bower_components/sass-bootstrap/lib/_panels.scss */ /* line 31, ../bower_components/sass-bootstrap/lib/_panels.scss */
.panel > .list-group .list-group-item, #header_notifs_icon_wrapper .notifs_panel > .list-group .list-group-item, #new_version_container > .list-group .list-group-item, #dashboard .panel > .data_list .list-group-item, #header_notifs_icon_wrapper #dashboard .notifs_panel > .data_list .list-group-item, #dashboard #header_notifs_icon_wrapper .notifs_panel > .data_list .list-group-item, #dashboard #new_version_container > .data_list .list-group-item, .panel > .list-group #dashboard .data_list li, #dashboard .data_list .panel > .list-group li, #header_notifs_icon_wrapper .notifs_panel > .list-group #dashboard .data_list li, #dashboard .data_list #header_notifs_icon_wrapper .notifs_panel > .list-group li, #new_version_container > .list-group #dashboard .data_list li, #dashboard .data_list #new_version_container > .list-group li, #dashboard .panel > .data_list li, #header_notifs_icon_wrapper #dashboard .notifs_panel > .data_list li, #dashboard #header_notifs_icon_wrapper .notifs_panel > .data_list li, #dashboard #new_version_container > .data_list li { .panel > .list-group .list-group-item, #header_notifs_icon_wrapper .notifs_panel > .list-group .list-group-item, #dash_version > .list-group .list-group-item, #dashboard .panel > .data_list .list-group-item, #header_notifs_icon_wrapper #dashboard .notifs_panel > .data_list .list-group-item, #dashboard #header_notifs_icon_wrapper .notifs_panel > .data_list .list-group-item, #dashboard #dash_version > .data_list .list-group-item, .panel > .list-group #dashboard .data_list li, #dashboard .data_list .panel > .list-group li, #header_notifs_icon_wrapper .notifs_panel > .list-group #dashboard .data_list li, #dashboard .data_list #header_notifs_icon_wrapper .notifs_panel > .list-group li, #dash_version > .list-group #dashboard .data_list li, #dashboard .data_list #dash_version > .list-group li, #dashboard .panel > .data_list li, #header_notifs_icon_wrapper #dashboard .notifs_panel > .data_list li, #dashboard #header_notifs_icon_wrapper .notifs_panel > .data_list li, #dashboard #dash_version > .data_list li {
border-width: 1px 0; } border-width: 1px 0; }
/* line 35, ../bower_components/sass-bootstrap/lib/_panels.scss */ /* line 35, ../bower_components/sass-bootstrap/lib/_panels.scss */
.panel > .list-group .list-group-item:first-child, #header_notifs_icon_wrapper .notifs_panel > .list-group .list-group-item:first-child, #new_version_container > .list-group .list-group-item:first-child, #dashboard .panel > .data_list .list-group-item:first-child, #header_notifs_icon_wrapper #dashboard .notifs_panel > .data_list .list-group-item:first-child, #dashboard #header_notifs_icon_wrapper .notifs_panel > .data_list .list-group-item:first-child, #dashboard #new_version_container > .data_list .list-group-item:first-child, .panel > .list-group #dashboard .data_list li:first-child, #dashboard .data_list .panel > .list-group li:first-child, #header_notifs_icon_wrapper .notifs_panel > .list-group #dashboard .data_list li:first-child, #dashboard .data_list #header_notifs_icon_wrapper .notifs_panel > .list-group li:first-child, #new_version_container > .list-group #dashboard .data_list li:first-child, #dashboard .data_list #new_version_container > .list-group li:first-child, #dashboard .panel > .data_list li:first-child, #header_notifs_icon_wrapper #dashboard .notifs_panel > .data_list li:first-child, #dashboard #header_notifs_icon_wrapper .notifs_panel > .data_list li:first-child, #dashboard #new_version_container > .data_list li:first-child { .panel > .list-group .list-group-item:first-child, #header_notifs_icon_wrapper .notifs_panel > .list-group .list-group-item:first-child, #dash_version > .list-group .list-group-item:first-child, #dashboard .panel > .data_list .list-group-item:first-child, #header_notifs_icon_wrapper #dashboard .notifs_panel > .data_list .list-group-item:first-child, #dashboard #header_notifs_icon_wrapper .notifs_panel > .data_list .list-group-item:first-child, #dashboard #dash_version > .data_list .list-group-item:first-child, .panel > .list-group #dashboard .data_list li:first-child, #dashboard .data_list .panel > .list-group li:first-child, #header_notifs_icon_wrapper .notifs_panel > .list-group #dashboard .data_list li:first-child, #dashboard .data_list #header_notifs_icon_wrapper .notifs_panel > .list-group li:first-child, #dash_version > .list-group #dashboard .data_list li:first-child, #dashboard .data_list #dash_version > .list-group li:first-child, #dashboard .panel > .data_list li:first-child, #header_notifs_icon_wrapper #dashboard .notifs_panel > .data_list li:first-child, #dashboard #header_notifs_icon_wrapper .notifs_panel > .data_list li:first-child, #dashboard #dash_version > .data_list li:first-child {
border-top-right-radius: 0; border-top-right-radius: 0;
border-top-left-radius: 0; } border-top-left-radius: 0; }
/* line 39, ../bower_components/sass-bootstrap/lib/_panels.scss */ /* line 39, ../bower_components/sass-bootstrap/lib/_panels.scss */
.panel > .list-group .list-group-item:last-child, #header_notifs_icon_wrapper .notifs_panel > .list-group .list-group-item:last-child, #new_version_container > .list-group .list-group-item:last-child, #dashboard .panel > .data_list .list-group-item:last-child, #header_notifs_icon_wrapper #dashboard .notifs_panel > .data_list .list-group-item:last-child, #dashboard #header_notifs_icon_wrapper .notifs_panel > .data_list .list-group-item:last-child, #dashboard #new_version_container > .data_list .list-group-item:last-child, .panel > .list-group #dashboard .data_list li:last-child, #dashboard .data_list .panel > .list-group li:last-child, #header_notifs_icon_wrapper .notifs_panel > .list-group #dashboard .data_list li:last-child, #dashboard .data_list #header_notifs_icon_wrapper .notifs_panel > .list-group li:last-child, #new_version_container > .list-group #dashboard .data_list li:last-child, #dashboard .data_list #new_version_container > .list-group li:last-child, #dashboard .panel > .data_list li:last-child, #header_notifs_icon_wrapper #dashboard .notifs_panel > .data_list li:last-child, #dashboard #header_notifs_icon_wrapper .notifs_panel > .data_list li:last-child, #dashboard #new_version_container > .data_list li:last-child { .panel > .list-group .list-group-item:last-child, #header_notifs_icon_wrapper .notifs_panel > .list-group .list-group-item:last-child, #dash_version > .list-group .list-group-item:last-child, #dashboard .panel > .data_list .list-group-item:last-child, #header_notifs_icon_wrapper #dashboard .notifs_panel > .data_list .list-group-item:last-child, #dashboard #header_notifs_icon_wrapper .notifs_panel > .data_list .list-group-item:last-child, #dashboard #dash_version > .data_list .list-group-item:last-child, .panel > .list-group #dashboard .data_list li:last-child, #dashboard .data_list .panel > .list-group li:last-child, #header_notifs_icon_wrapper .notifs_panel > .list-group #dashboard .data_list li:last-child, #dashboard .data_list #header_notifs_icon_wrapper .notifs_panel > .list-group li:last-child, #dash_version > .list-group #dashboard .data_list li:last-child, #dashboard .data_list #dash_version > .list-group li:last-child, #dashboard .panel > .data_list li:last-child, #header_notifs_icon_wrapper #dashboard .notifs_panel > .data_list li:last-child, #dashboard #header_notifs_icon_wrapper .notifs_panel > .data_list li:last-child, #dashboard #dash_version > .data_list li:last-child {
border-bottom: 0; } border-bottom: 0; }
/* line 47, ../bower_components/sass-bootstrap/lib/_panels.scss */ /* line 47, ../bower_components/sass-bootstrap/lib/_panels.scss */
@@ -4427,10 +4427,10 @@ a.list-group-item:hover, a.list-group-item:focus {
border-top-width: 0; } border-top-width: 0; }
/* line 59, ../bower_components/sass-bootstrap/lib/_panels.scss */ /* line 59, ../bower_components/sass-bootstrap/lib/_panels.scss */
.panel > .table, #header_notifs_icon_wrapper .notifs_panel > .table, #new_version_container > .table { .panel > .table, #header_notifs_icon_wrapper .notifs_panel > .table, #dash_version > .table {
margin-bottom: 0; } margin-bottom: 0; }
/* line 62, ../bower_components/sass-bootstrap/lib/_panels.scss */ /* line 62, ../bower_components/sass-bootstrap/lib/_panels.scss */
.panel > .panel-body + .table, #header_notifs_icon_wrapper .notifs_panel > .panel-body + .table, #new_version_container > .panel-body + .table { .panel > .panel-body + .table, #header_notifs_icon_wrapper .notifs_panel > .panel-body + .table, #dash_version > .panel-body + .table {
border-top: 1px solid #dddddd; } border-top: 1px solid #dddddd; }
/* line 69, ../bower_components/sass-bootstrap/lib/_panels.scss */ /* line 69, ../bower_components/sass-bootstrap/lib/_panels.scss */
@@ -4458,12 +4458,12 @@ a.list-group-item:hover, a.list-group-item:focus {
border-bottom-left-radius: 2px; } border-bottom-left-radius: 2px; }
/* line 101, ../bower_components/sass-bootstrap/lib/_panels.scss */ /* line 101, ../bower_components/sass-bootstrap/lib/_panels.scss */
.panel-group .panel, .panel-group #header_notifs_icon_wrapper .notifs_panel, #header_notifs_icon_wrapper .panel-group .notifs_panel, .panel-group #new_version_container { .panel-group .panel, .panel-group #header_notifs_icon_wrapper .notifs_panel, #header_notifs_icon_wrapper .panel-group .notifs_panel, .panel-group #dash_version {
margin-bottom: 0; margin-bottom: 0;
border-radius: 3px; border-radius: 3px;
overflow: hidden; } overflow: hidden; }
/* line 105, ../bower_components/sass-bootstrap/lib/_panels.scss */ /* line 105, ../bower_components/sass-bootstrap/lib/_panels.scss */
.panel-group .panel + .panel, .panel-group #header_notifs_icon_wrapper .notifs_panel + .panel, #header_notifs_icon_wrapper .panel-group .notifs_panel + .panel, .panel-group #new_version_container + .panel, .panel-group #header_notifs_icon_wrapper .panel + .notifs_panel, #header_notifs_icon_wrapper .panel-group .panel + .notifs_panel, .panel-group #header_notifs_icon_wrapper .notifs_panel + .notifs_panel, #header_notifs_icon_wrapper .panel-group .notifs_panel + .notifs_panel, .panel-group #header_notifs_icon_wrapper #new_version_container + .notifs_panel, #header_notifs_icon_wrapper .panel-group #new_version_container + .notifs_panel, .panel-group .panel + #new_version_container, .panel-group #header_notifs_icon_wrapper .notifs_panel + #new_version_container, #header_notifs_icon_wrapper .panel-group .notifs_panel + #new_version_container, .panel-group #new_version_container + #new_version_container { .panel-group .panel + .panel, .panel-group #header_notifs_icon_wrapper .notifs_panel + .panel, #header_notifs_icon_wrapper .panel-group .notifs_panel + .panel, .panel-group #dash_version + .panel, .panel-group #header_notifs_icon_wrapper .panel + .notifs_panel, #header_notifs_icon_wrapper .panel-group .panel + .notifs_panel, .panel-group #header_notifs_icon_wrapper .notifs_panel + .notifs_panel, #header_notifs_icon_wrapper .panel-group .notifs_panel + .notifs_panel, .panel-group #header_notifs_icon_wrapper #dash_version + .notifs_panel, #header_notifs_icon_wrapper .panel-group #dash_version + .notifs_panel, .panel-group .panel + #dash_version, .panel-group #header_notifs_icon_wrapper .notifs_panel + #dash_version, #header_notifs_icon_wrapper .panel-group .notifs_panel + #dash_version, .panel-group #dash_version + #dash_version {
margin-top: 5px; } margin-top: 5px; }
/* line 110, ../bower_components/sass-bootstrap/lib/_panels.scss */ /* line 110, ../bower_components/sass-bootstrap/lib/_panels.scss */
.panel-group .panel-heading, .panel-group #header_notifs_icon_wrapper .notifs_panel .notifs_panel_header, #header_notifs_icon_wrapper .notifs_panel .panel-group .notifs_panel_header { .panel-group .panel-heading, .panel-group #header_notifs_icon_wrapper .notifs_panel .notifs_panel_header, #header_notifs_icon_wrapper .notifs_panel .panel-group .notifs_panel_header {
@@ -7620,7 +7620,7 @@ html, body {
-o-transition-timing-function: ease-out; -o-transition-timing-function: ease-out;
transition-timing-function: ease-out; } transition-timing-function: ease-out; }
/* line 83, admin-theme.sass */ /* line 83, admin-theme.sass */
#content fieldset, #content .panel, #content #header_notifs_icon_wrapper .notifs_panel, #header_notifs_icon_wrapper #content .notifs_panel, #content #new_version_container { #content fieldset, #content .panel, #content #header_notifs_icon_wrapper .notifs_panel, #header_notifs_icon_wrapper #content .notifs_panel, #content #dash_version {
padding: 20px; padding: 20px;
margin-bottom: 20px; margin-bottom: 20px;
border: solid 1px #dfdfdf; border: solid 1px #dfdfdf;
@@ -9424,10 +9424,10 @@ textarea {
transform: scale(1); } } transform: scale(1); } }
/* line 227, _dashboard.sass */ /* line 227, _dashboard.sass */
#new_version_container { #dash_version {
padding: 0 !important; padding: 0 !important;
overflow: hidden; } overflow: hidden; }
/* line 231, _dashboard.sass */ /* line 231, _dashboard.sass */
#new_version_container iframe { #dash_version iframe {
height: 120px; height: 140px;
width: 100%; } width: 100%; }
admin-dev/themes/default/template/controllers/dashboard/helpers/view/view.tpl
+5 -2
View File
@@ -54,11 +54,14 @@
{$hookDashboardZoneTwo} {$hookDashboardZoneTwo}
</div> </div>
<div class="col-lg-2"> <div class="col-lg-2">
<div id="new_version_container"></div>
<iframe frameborder="no" allowtransparency="true" src="{$new_version_url}"></iframe>
<section class="dash_news panel"> <section class="dash_news panel">
<h4><i class="icon-rss"></i> PrestaShop News</h4> <h4><i class="icon-rss"></i> PrestaShop News</h4>
</section> </section>
<section id="dash_version" class="visible-lg">
<iframe frameborder="no" scrolling="no" allowtransparency="true" src="{$new_version_url}"></iframe>
</section>
<section class="dash_links panel"> <section class="dash_links panel">
<h4><i class="icon-link"></i>{l s="Useful PrestaShop Links"}</h4> <h4><i class="icon-link"></i>{l s="Useful PrestaShop Links"}</h4>
<dl> <dl>