From 0019426e81ccd984b24b8df0a5acf73b8a0c7fb5 Mon Sep 17 00:00:00 2001 From: Vincent Augagneur Date: Wed, 28 Aug 2013 10:04:28 +0200 Subject: [PATCH 1/2] //added dashboard controller --- .../dashboard/helpers/view/view.tpl | 0 .../admin/AdminDashboardController.php | 34 +++++++++++++++++++ install-dev/data/xml/access.xml | 1 + install-dev/data/xml/tab.xml | 3 ++ install-dev/langs/fr/data/tab.xml | 1 + 5 files changed, 39 insertions(+) create mode 100644 admin-dev/themes/default/template/controllers/dashboard/helpers/view/view.tpl create mode 100644 controllers/admin/AdminDashboardController.php diff --git a/admin-dev/themes/default/template/controllers/dashboard/helpers/view/view.tpl b/admin-dev/themes/default/template/controllers/dashboard/helpers/view/view.tpl new file mode 100644 index 000000000..e69de29bb diff --git a/controllers/admin/AdminDashboardController.php b/controllers/admin/AdminDashboardController.php new file mode 100644 index 000000000..a9272056a --- /dev/null +++ b/controllers/admin/AdminDashboardController.php @@ -0,0 +1,34 @@ + +* @copyright 2007-2013 PrestaShop SA +* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) +* International Registered Trademark & Property of PrestaShop SA +*/ + +class AdminDashboardControllerCore extends AdminController +{ + public function __construct() + { + $this->display = 'view'; + parent::__construct(); + } +} \ No newline at end of file diff --git a/install-dev/data/xml/access.xml b/install-dev/data/xml/access.xml index 9b71e93fc..8f6587d85 100644 --- a/install-dev/data/xml/access.xml +++ b/install-dev/data/xml/access.xml @@ -98,5 +98,6 @@ + diff --git a/install-dev/data/xml/tab.xml b/install-dev/data/xml/tab.xml index 477d81b3d..dd992ca4d 100644 --- a/install-dev/data/xml/tab.xml +++ b/install-dev/data/xml/tab.xml @@ -9,6 +9,9 @@ AdminHome + + AdminDashboard + AdminCms diff --git a/install-dev/langs/fr/data/tab.xml b/install-dev/langs/fr/data/tab.xml index 81b51d5fc..4af2a16b7 100644 --- a/install-dev/langs/fr/data/tab.xml +++ b/install-dev/langs/fr/data/tab.xml @@ -1,6 +1,7 @@ + From ecb4d65347365af39105d8ec44fbaca59fb168e5 Mon Sep 17 00:00:00 2001 From: Kevin Granger Date: Wed, 28 Aug 2013 10:06:52 +0200 Subject: [PATCH 2/2] // list toolbar --- admin-dev/themes/default/css/admin-theme.css | 68 +++++++++++++------ admin-dev/themes/default/css/admin-theme.sass | 25 +++++++ 2 files changed, 74 insertions(+), 19 deletions(-) diff --git a/admin-dev/themes/default/css/admin-theme.css b/admin-dev/themes/default/css/admin-theme.css index ccbb82509..a01c6631e 100644 --- a/admin-dev/themes/default/css/admin-theme.css +++ b/admin-dev/themes/default/css/admin-theme.css @@ -514,17 +514,18 @@ blockquote { color: #999999; } blockquote small:before { content: '\2014 \00A0'; } - blockquote.pull-right { + blockquote.pull-right, blockquote.panel-heading-action { padding-right: 15px; padding-left: 0; border-right: 5px solid #eeeeee; border-left: 0; } - blockquote.pull-right p, - blockquote.pull-right small { + blockquote.pull-right p, blockquote.panel-heading-action p, + blockquote.pull-right small, + blockquote.panel-heading-action small { text-align: right; } - blockquote.pull-right small:before { + blockquote.pull-right small:before, blockquote.panel-heading-action small:before { content: ''; } - blockquote.pull-right small:after { + blockquote.pull-right small:after, blockquote.panel-heading-action small:after { content: '\00A0 \2014'; } q:before, @@ -2526,7 +2527,7 @@ input[type="button"].btn-block { -webkit-box-shadow: 0 6px 12px rgba(0, 0, 0, 0.175); box-shadow: 0 6px 12px rgba(0, 0, 0, 0.175); background-clip: padding-box; } - .dropdown-menu.pull-right { + .dropdown-menu.pull-right, .dropdown-menu.panel-heading-action { right: 0; left: auto; } .dropdown-menu .divider { @@ -2584,7 +2585,7 @@ input[type="button"].btn-block { top: 0; z-index: 990; } -.pull-right > .dropdown-menu { +.pull-right > .dropdown-menu, .panel-heading-action > .dropdown-menu { right: 0; left: auto; } @@ -3193,11 +3194,15 @@ input[type="button"].btn-block { border-bottom-right-radius: 0; border-bottom-left-radius: 0; } -.navbar-nav.pull-right > li > .dropdown-menu, .pull-right#header_notifs_icon_wrapper > li > .dropdown-menu, .pull-right#header_employee_box > li > .dropdown-menu, .pull-right#header_quick > li > .dropdown-menu, +.navbar-nav.pull-right > li > .dropdown-menu, .pull-right#header_notifs_icon_wrapper > li > .dropdown-menu, #header_notifs_icon_wrapper.panel-heading-action > li > .dropdown-menu, .pull-right#header_employee_box > li > .dropdown-menu, #header_employee_box.panel-heading-action > li > .dropdown-menu, .pull-right#header_quick > li > .dropdown-menu, #header_quick.panel-heading-action > li > .dropdown-menu, .navbar-nav.panel-heading-action > li > .dropdown-menu, .navbar-nav > li > .dropdown-menu.pull-right, #header_notifs_icon_wrapper > li > .dropdown-menu.pull-right, #header_employee_box > li > .dropdown-menu.pull-right, -#header_quick > li > .dropdown-menu.pull-right { +#header_quick > li > .dropdown-menu.pull-right, +.navbar-nav > li > .dropdown-menu.panel-heading-action, +#header_notifs_icon_wrapper > li > .dropdown-menu.panel-heading-action, +#header_employee_box > li > .dropdown-menu.panel-heading-action, +#header_quick > li > .dropdown-menu.panel-heading-action { left: auto; right: 0; } @@ -3774,7 +3779,7 @@ a.thumbnail:focus { .media > .pull-left, .page-head .media > h2.page-title { margin-right: 10px; } -.media > .pull-right { +.media > .pull-right, .media > .panel-heading-action { margin-left: 10px; } .media-list { @@ -4473,7 +4478,7 @@ body.modal-open { .clearfix:after { clear: both; } -.pull-right { +.pull-right, .panel-heading-action { float: right !important; } .pull-left, .page-head h2.page-title { @@ -5089,7 +5094,7 @@ a [class*=" icon-"] { -moz-border-radius: 7px; border-radius: 7px; } -.pull-right { +.pull-right, .panel-heading-action { float: right; } .pull-left, .page-head h2.page-title { @@ -5100,8 +5105,9 @@ a [class*=" icon-"] { .page-head h2[class*=" icon-"].page-title { margin-right: .3em; } -[class^="icon-"].pull-right, -[class*=" icon-"].pull-right { +[class^="icon-"].pull-right, [class^="icon-"].panel-heading-action, +[class*=" icon-"].pull-right, +[class*=" icon-"].panel-heading-action { margin-left: .3em; } /* BOOTSTRAP SPECIFIC CLASSES @@ -5189,7 +5195,9 @@ a [class*=" icon-"] { .btn .page-head h2[class*=" icon-"].icon-2x.page-title, .page-head .btn h2[class*=" icon-"].icon-2x.page-title, .btn [class^="icon-"].pull-right.icon-2x, -.btn [class*=" icon-"].pull-right.icon-2x { +.btn [class^="icon-"].icon-2x.panel-heading-action, +.btn [class*=" icon-"].pull-right.icon-2x, +.btn [class*=" icon-"].icon-2x.panel-heading-action { margin-top: .18em; } .btn [class^="icon-"].icon-spin.icon-large, @@ -5201,7 +5209,9 @@ a [class*=" icon-"] { .btn.btn-small .page-head h2[class*=" icon-"].icon-2x.page-title, .page-head .btn.btn-small h2[class*=" icon-"].icon-2x.page-title, .btn.btn-small [class^="icon-"].pull-right.icon-2x, -.btn.btn-small [class*=" icon-"].pull-right.icon-2x { +.btn.btn-small [class^="icon-"].icon-2x.panel-heading-action, +.btn.btn-small [class*=" icon-"].pull-right.icon-2x, +.btn.btn-small [class*=" icon-"].icon-2x.panel-heading-action { margin-top: .25em; } .btn.btn-large [class^="icon-"], @@ -5213,7 +5223,9 @@ a [class*=" icon-"] { .btn.btn-large .page-head h2[class*=" icon-"].icon-2x.page-title, .page-head .btn.btn-large h2[class*=" icon-"].icon-2x.page-title, .btn.btn-large [class^="icon-"].pull-right.icon-2x, -.btn.btn-large [class*=" icon-"].pull-right.icon-2x { +.btn.btn-large [class^="icon-"].icon-2x.panel-heading-action, +.btn.btn-large [class*=" icon-"].pull-right.icon-2x, +.btn.btn-large [class*=" icon-"].icon-2x.panel-heading-action { margin-top: .05em; } .btn.btn-large [class^="icon-"].pull-left.icon-2x, .btn.btn-large .page-head h2[class^="icon-"].icon-2x.page-title, .page-head .btn.btn-large h2[class^="icon-"].icon-2x.page-title, @@ -5222,8 +5234,9 @@ a [class*=" icon-"] { .page-head .btn.btn-large h2[class*=" icon-"].icon-2x.page-title { margin-right: .2em; } -.btn.btn-large [class^="icon-"].pull-right.icon-2x, -.btn.btn-large [class*=" icon-"].pull-right.icon-2x { +.btn.btn-large [class^="icon-"].pull-right.icon-2x, .btn.btn-large [class^="icon-"].icon-2x.panel-heading-action, +.btn.btn-large [class*=" icon-"].pull-right.icon-2x, +.btn.btn-large [class*=" icon-"].icon-2x.panel-heading-action { margin-left: .2em; } /* Fixes alignment in nav lists */ @@ -7423,3 +7436,20 @@ tr.filter { padding: 0 10px; } .module_col_actions .btn-group { text-align: left; } + +.panel-heading-action { + margin-right: -5px; } + .panel-heading-action a.list-tooolbar-btn { + float: left; + height: 30px; + width: 30px; + color: #1d7878; + border-left: solid 1px white; } + .panel-heading-action a.list-tooolbar-btn:hover { + text-decoration: none; + color: white; + background-color: #1d7878; } + .panel-heading-action a.list-tooolbar-btn i { + text-align: center; + font-size: 1.2em; + line-height: 30px; } diff --git a/admin-dev/themes/default/css/admin-theme.sass b/admin-dev/themes/default/css/admin-theme.sass index 126c6c11b..9c7dfc2db 100755 --- a/admin-dev/themes/default/css/admin-theme.sass +++ b/admin-dev/themes/default/css/admin-theme.sass @@ -928,3 +928,28 @@ fieldset > .row text-align: left +.panel-heading-action + @extend .pull-right + margin-right: -5px + a.list-tooolbar-btn + float: left + height: 30px + width: 30px + color: $brand-primary + border-left: solid 1px white + &:hover + text-decoration: none + color: white + background-color: $brand-primary + i + text-align: center + font-size: 1.2em + line-height: 30px + + + + + + + +