diff --git a/templates/admin/default/admin-layout.tpl b/templates/admin/default/admin-layout.tpl index 8bef5c011..d392919ad 100644 --- a/templates/admin/default/admin-layout.tpl +++ b/templates/admin/default/admin-layout.tpl @@ -214,15 +214,15 @@ {/javascripts} - {block name="after-javascript-include"}{/block} - - {javascripts file='assets/js/bootstrap/bootstrap.js'} - - {/javascripts} + {block name="after-javascript-include"}{/block} {block name="javascript-initialization"}{/block} {* Modules scripts are included now *} {module_include location='footer_js'} + + {javascripts file='assets/js/bootstrap/bootstrap.js'} + + {/javascripts} \ No newline at end of file diff --git a/templates/admin/default/assets/css/jqueryui/custom-theme/images/animated-overlay.gif b/templates/admin/default/assets/css/jqueryui/custom-theme/images/animated-overlay.gif deleted file mode 100755 index d441f75eb..000000000 Binary files a/templates/admin/default/assets/css/jqueryui/custom-theme/images/animated-overlay.gif and /dev/null differ diff --git a/templates/admin/default/assets/css/jqueryui/custom-theme/images/ui-bg_flat_0_aaaaaa_40x100.png b/templates/admin/default/assets/css/jqueryui/custom-theme/images/ui-bg_flat_0_aaaaaa_40x100.png deleted file mode 100755 index 2399a7bb2..000000000 Binary files a/templates/admin/default/assets/css/jqueryui/custom-theme/images/ui-bg_flat_0_aaaaaa_40x100.png and /dev/null differ diff --git a/templates/admin/default/assets/css/jqueryui/custom-theme/images/ui-bg_flat_75_F9F9F9_40x100.png b/templates/admin/default/assets/css/jqueryui/custom-theme/images/ui-bg_flat_75_F9F9F9_40x100.png deleted file mode 100755 index 3684702ed..000000000 Binary files a/templates/admin/default/assets/css/jqueryui/custom-theme/images/ui-bg_flat_75_F9F9F9_40x100.png and /dev/null differ diff --git a/templates/admin/default/assets/css/jqueryui/custom-theme/images/ui-bg_glass_55_fbf9ee_1x400.png b/templates/admin/default/assets/css/jqueryui/custom-theme/images/ui-bg_glass_55_fbf9ee_1x400.png deleted file mode 100755 index e04a29bdb..000000000 Binary files a/templates/admin/default/assets/css/jqueryui/custom-theme/images/ui-bg_glass_55_fbf9ee_1x400.png and /dev/null differ diff --git a/templates/admin/default/assets/css/jqueryui/custom-theme/images/ui-bg_glass_95_fef1ec_1x400.png b/templates/admin/default/assets/css/jqueryui/custom-theme/images/ui-bg_glass_95_fef1ec_1x400.png deleted file mode 100755 index 4070c9712..000000000 Binary files a/templates/admin/default/assets/css/jqueryui/custom-theme/images/ui-bg_glass_95_fef1ec_1x400.png and /dev/null differ diff --git a/templates/admin/default/assets/css/jqueryui/custom-theme/images/ui-bg_highlight-hard_75_FFF_1x100.png b/templates/admin/default/assets/css/jqueryui/custom-theme/images/ui-bg_highlight-hard_75_FFF_1x100.png deleted file mode 100755 index c62113829..000000000 Binary files a/templates/admin/default/assets/css/jqueryui/custom-theme/images/ui-bg_highlight-hard_75_FFF_1x100.png and /dev/null differ diff --git a/templates/admin/default/assets/css/jqueryui/custom-theme/images/ui-bg_highlight-soft_100_f39922_1x100.png b/templates/admin/default/assets/css/jqueryui/custom-theme/images/ui-bg_highlight-soft_100_f39922_1x100.png deleted file mode 100755 index 359678014..000000000 Binary files a/templates/admin/default/assets/css/jqueryui/custom-theme/images/ui-bg_highlight-soft_100_f39922_1x100.png and /dev/null differ diff --git a/templates/admin/default/assets/css/jqueryui/custom-theme/images/ui-bg_highlight-soft_65_f39922_1x100.png b/templates/admin/default/assets/css/jqueryui/custom-theme/images/ui-bg_highlight-soft_65_f39922_1x100.png deleted file mode 100755 index 4718fe2f0..000000000 Binary files a/templates/admin/default/assets/css/jqueryui/custom-theme/images/ui-bg_highlight-soft_65_f39922_1x100.png and /dev/null differ diff --git a/templates/admin/default/assets/css/jqueryui/custom-theme/images/ui-bg_highlight-soft_75_f39922_1x100.png b/templates/admin/default/assets/css/jqueryui/custom-theme/images/ui-bg_highlight-soft_75_f39922_1x100.png deleted file mode 100755 index 87578c6c4..000000000 Binary files a/templates/admin/default/assets/css/jqueryui/custom-theme/images/ui-bg_highlight-soft_75_f39922_1x100.png and /dev/null differ diff --git a/templates/admin/default/assets/css/jqueryui/custom-theme/images/ui-icons_2e83ff_256x240.png b/templates/admin/default/assets/css/jqueryui/custom-theme/images/ui-icons_2e83ff_256x240.png deleted file mode 100755 index 84b601bf0..000000000 Binary files a/templates/admin/default/assets/css/jqueryui/custom-theme/images/ui-icons_2e83ff_256x240.png and /dev/null differ diff --git a/templates/admin/default/assets/css/jqueryui/custom-theme/images/ui-icons_333333_256x240.png b/templates/admin/default/assets/css/jqueryui/custom-theme/images/ui-icons_333333_256x240.png deleted file mode 100755 index fab88f726..000000000 Binary files a/templates/admin/default/assets/css/jqueryui/custom-theme/images/ui-icons_333333_256x240.png and /dev/null differ diff --git a/templates/admin/default/assets/css/jqueryui/custom-theme/images/ui-icons_454545_256x240.png b/templates/admin/default/assets/css/jqueryui/custom-theme/images/ui-icons_454545_256x240.png deleted file mode 100755 index b6db1acdd..000000000 Binary files a/templates/admin/default/assets/css/jqueryui/custom-theme/images/ui-icons_454545_256x240.png and /dev/null differ diff --git a/templates/admin/default/assets/css/jqueryui/custom-theme/images/ui-icons_888888_256x240.png b/templates/admin/default/assets/css/jqueryui/custom-theme/images/ui-icons_888888_256x240.png deleted file mode 100755 index feea0e202..000000000 Binary files a/templates/admin/default/assets/css/jqueryui/custom-theme/images/ui-icons_888888_256x240.png and /dev/null differ diff --git a/templates/admin/default/assets/css/jqueryui/custom-theme/images/ui-icons_FFF_256x240.png b/templates/admin/default/assets/css/jqueryui/custom-theme/images/ui-icons_FFF_256x240.png deleted file mode 100755 index 4f624bb2b..000000000 Binary files a/templates/admin/default/assets/css/jqueryui/custom-theme/images/ui-icons_FFF_256x240.png and /dev/null differ diff --git a/templates/admin/default/assets/css/jqueryui/custom-theme/images/ui-icons_cd0a0a_256x240.png b/templates/admin/default/assets/css/jqueryui/custom-theme/images/ui-icons_cd0a0a_256x240.png deleted file mode 100755 index ed5b6b093..000000000 Binary files a/templates/admin/default/assets/css/jqueryui/custom-theme/images/ui-icons_cd0a0a_256x240.png and /dev/null differ diff --git a/templates/admin/default/assets/css/jqueryui/custom-theme/jquery-ui-1.10.3.custom.css b/templates/admin/default/assets/css/jqueryui/custom-theme/jquery-ui-1.10.3.custom.css deleted file mode 100755 index ab828f01b..000000000 --- a/templates/admin/default/assets/css/jqueryui/custom-theme/jquery-ui-1.10.3.custom.css +++ /dev/null @@ -1,1177 +0,0 @@ -/*! jQuery UI - v1.10.3 - 2013-09-03 -* http://jqueryui.com -* Includes: jquery.ui.core.css, jquery.ui.resizable.css, jquery.ui.selectable.css, jquery.ui.accordion.css, jquery.ui.autocomplete.css, jquery.ui.button.css, jquery.ui.datepicker.css, jquery.ui.dialog.css, jquery.ui.menu.css, jquery.ui.progressbar.css, jquery.ui.slider.css, jquery.ui.spinner.css, jquery.ui.tabs.css, jquery.ui.tooltip.css -* To view and modify this theme, visit http://jqueryui.com/themeroller/?ffDefault=%22Helvetica%20Neue%22%2C%20Helvetica%2C%20Arial%2C%20sans-serif&fwDefault=normal&fsDefault=12px&cornerRadius=4px&bgColorHeader=%23f39922&bgTextureHeader=highlight_soft&bgImgOpacityHeader=100&borderColorHeader=%23eab791&fcHeader=%23FFF&iconColorHeader=%23FFF&bgColorContent=%23F9F9F9&bgTextureContent=flat&bgImgOpacityContent=75&borderColorContent=%23aaaaaa&fcContent=%23333333&iconColorContent=%23333333&bgColorDefault=%23FFF&bgTextureDefault=highlight_hard&bgImgOpacityDefault=75&borderColorDefault=%23d3d3d3&fcDefault=%23555555&iconColorDefault=%23888888&bgColorHover=%23f39922&bgTextureHover=highlight_soft&bgImgOpacityHover=75&borderColorHover=%23999999&fcHover=%23fff&iconColorHover=%23454545&bgColorActive=%23f39922&bgTextureActive=highlight_soft&bgImgOpacityActive=65&borderColorActive=%23aaaaaa&fcActive=%23fff&iconColorActive=%23fff&bgColorHighlight=%23fbf9ee&bgTextureHighlight=glass&bgImgOpacityHighlight=55&borderColorHighlight=%23fcefa1&fcHighlight=%23363636&iconColorHighlight=%232e83ff&bgColorError=%23fef1ec&bgTextureError=glass&bgImgOpacityError=95&borderColorError=%23cd0a0a&fcError=%23cd0a0a&iconColorError=%23cd0a0a&bgColorOverlay=%23aaaaaa&bgTextureOverlay=flat&bgImgOpacityOverlay=0&opacityOverlay=30&bgColorShadow=%23aaaaaa&bgTextureShadow=flat&bgImgOpacityShadow=0&opacityShadow=30&thicknessShadow=8px&offsetTopShadow=-8px&offsetLeftShadow=-8px&cornerRadiusShadow=8px -* Copyright 2013 jQuery Foundation and other contributors Licensed MIT */ - -/* Layout helpers -----------------------------------*/ -.ui-helper-hidden { - display: none; -} -.ui-helper-hidden-accessible { - border: 0; - clip: rect(0 0 0 0); - height: 1px; - margin: -1px; - overflow: hidden; - padding: 0; - position: absolute; - width: 1px; -} -.ui-helper-reset { - margin: 0; - padding: 0; - border: 0; - outline: 0; - line-height: 1.3; - text-decoration: none; - font-size: 100%; - list-style: none; -} -.ui-helper-clearfix:before, -.ui-helper-clearfix:after { - content: ""; - display: table; - border-collapse: collapse; -} -.ui-helper-clearfix:after { - clear: both; -} -.ui-helper-clearfix { - min-height: 0; /* support: IE7 */ -} -.ui-helper-zfix { - width: 100%; - height: 100%; - top: 0; - left: 0; - position: absolute; - opacity: 0; - filter:Alpha(Opacity=0); -} - -.ui-front { - z-index: 100; -} - - -/* Interaction Cues -----------------------------------*/ -.ui-state-disabled { - cursor: default !important; -} - - -/* Icons -----------------------------------*/ - -/* states and images */ -.ui-icon { - display: block; - text-indent: -99999px; - overflow: hidden; - background-repeat: no-repeat; -} - - -/* Misc visuals -----------------------------------*/ - -/* Overlays */ -.ui-widget-overlay { - position: fixed; - top: 0; - left: 0; - width: 100%; - height: 100%; -} -.ui-resizable { - position: relative; -} -.ui-resizable-handle { - position: absolute; - font-size: 0.1px; - display: block; -} -.ui-resizable-disabled .ui-resizable-handle, -.ui-resizable-autohide .ui-resizable-handle { - display: none; -} -.ui-resizable-n { - cursor: n-resize; - height: 7px; - width: 100%; - top: -5px; - left: 0; -} -.ui-resizable-s { - cursor: s-resize; - height: 7px; - width: 100%; - bottom: -5px; - left: 0; -} -.ui-resizable-e { - cursor: e-resize; - width: 7px; - right: -5px; - top: 0; - height: 100%; -} -.ui-resizable-w { - cursor: w-resize; - width: 7px; - left: -5px; - top: 0; - height: 100%; -} -.ui-resizable-se { - cursor: se-resize; - width: 12px; - height: 12px; - right: 1px; - bottom: 1px; -} -.ui-resizable-sw { - cursor: sw-resize; - width: 9px; - height: 9px; - left: -5px; - bottom: -5px; -} -.ui-resizable-nw { - cursor: nw-resize; - width: 9px; - height: 9px; - left: -5px; - top: -5px; -} -.ui-resizable-ne { - cursor: ne-resize; - width: 9px; - height: 9px; - right: -5px; - top: -5px; -} -.ui-selectable-helper { - position: absolute; - z-index: 100; - border: 1px dotted black; -} -.ui-accordion .ui-accordion-header { - display: block; - cursor: pointer; - position: relative; - margin-top: 2px; - padding: .5em .5em .5em .7em; - min-height: 0; /* support: IE7 */ -} -.ui-accordion .ui-accordion-icons { - padding-left: 2.2em; -} -.ui-accordion .ui-accordion-noicons { - padding-left: .7em; -} -.ui-accordion .ui-accordion-icons .ui-accordion-icons { - padding-left: 2.2em; -} -.ui-accordion .ui-accordion-header .ui-accordion-header-icon { - position: absolute; - left: .5em; - top: 50%; - margin-top: -8px; -} -.ui-accordion .ui-accordion-content { - padding: 1em 2.2em; - border-top: 0; - overflow: auto; -} -.ui-autocomplete { - position: absolute; - top: 0; - left: 0; - cursor: default; -} -.ui-button { - display: inline-block; - position: relative; - padding: 0; - line-height: normal; - margin-right: .1em; - cursor: pointer; - vertical-align: middle; - text-align: center; - overflow: visible; /* removes extra width in IE */ -} -.ui-button, -.ui-button:link, -.ui-button:visited, -.ui-button:hover, -.ui-button:active { - text-decoration: none; -} -/* to make room for the icon, a width needs to be set here */ -.ui-button-icon-only { - width: 2.2em; -} -/* button elements seem to need a little more width */ -button.ui-button-icon-only { - width: 2.4em; -} -.ui-button-icons-only { - width: 3.4em; -} -button.ui-button-icons-only { - width: 3.7em; -} - -/* button text element */ -.ui-button .ui-button-text { - display: block; - line-height: normal; -} -.ui-button-text-only .ui-button-text { - padding: .4em 1em; -} -.ui-button-icon-only .ui-button-text, -.ui-button-icons-only .ui-button-text { - padding: .4em; - text-indent: -9999999px; -} -.ui-button-text-icon-primary .ui-button-text, -.ui-button-text-icons .ui-button-text { - padding: .4em 1em .4em 2.1em; -} -.ui-button-text-icon-secondary .ui-button-text, -.ui-button-text-icons .ui-button-text { - padding: .4em 2.1em .4em 1em; -} -.ui-button-text-icons .ui-button-text { - padding-left: 2.1em; - padding-right: 2.1em; -} -/* no icon support for input elements, provide padding by default */ -input.ui-button { - padding: .4em 1em; -} - -/* button icon element(s) */ -.ui-button-icon-only .ui-icon, -.ui-button-text-icon-primary .ui-icon, -.ui-button-text-icon-secondary .ui-icon, -.ui-button-text-icons .ui-icon, -.ui-button-icons-only .ui-icon { - position: absolute; - top: 50%; - margin-top: -8px; -} -.ui-button-icon-only .ui-icon { - left: 50%; - margin-left: -8px; -} -.ui-button-text-icon-primary .ui-button-icon-primary, -.ui-button-text-icons .ui-button-icon-primary, -.ui-button-icons-only .ui-button-icon-primary { - left: .5em; -} -.ui-button-text-icon-secondary .ui-button-icon-secondary, -.ui-button-text-icons .ui-button-icon-secondary, -.ui-button-icons-only .ui-button-icon-secondary { - right: .5em; -} - -/* button sets */ -.ui-buttonset { - margin-right: 7px; -} -.ui-buttonset .ui-button { - margin-left: 0; - margin-right: -.3em; -} - -/* workarounds */ -/* reset extra padding in Firefox, see h5bp.com/l */ -input.ui-button::-moz-focus-inner, -button.ui-button::-moz-focus-inner { - border: 0; - padding: 0; -} -.ui-datepicker { - width: 17em; - padding: .2em .2em 0; - display: none; -} -.ui-datepicker .ui-datepicker-header { - position: relative; - padding: .2em 0; -} -.ui-datepicker .ui-datepicker-prev, -.ui-datepicker .ui-datepicker-next { - position: absolute; - top: 2px; - width: 1.8em; - height: 1.8em; -} -.ui-datepicker .ui-datepicker-prev-hover, -.ui-datepicker .ui-datepicker-next-hover { - top: 1px; -} -.ui-datepicker .ui-datepicker-prev { - left: 2px; -} -.ui-datepicker .ui-datepicker-next { - right: 2px; -} -.ui-datepicker .ui-datepicker-prev-hover { - left: 1px; -} -.ui-datepicker .ui-datepicker-next-hover { - right: 1px; -} -.ui-datepicker .ui-datepicker-prev span, -.ui-datepicker .ui-datepicker-next span { - display: block; - position: absolute; - left: 50%; - margin-left: -8px; - top: 50%; - margin-top: -8px; -} -.ui-datepicker .ui-datepicker-title { - margin: 0 2.3em; - line-height: 1.8em; - text-align: center; -} -.ui-datepicker .ui-datepicker-title select { - font-size: 1em; - margin: 1px 0; -} -.ui-datepicker select.ui-datepicker-month-year { - width: 100%; -} -.ui-datepicker select.ui-datepicker-month, -.ui-datepicker select.ui-datepicker-year { - width: 49%; -} -.ui-datepicker table { - width: 100%; - font-size: .9em; - border-collapse: collapse; - margin: 0 0 .4em; -} -.ui-datepicker th { - padding: .7em .3em; - text-align: center; - font-weight: bold; - border: 0; -} -.ui-datepicker td { - border: 0; - padding: 1px; -} -.ui-datepicker td span, -.ui-datepicker td a { - display: block; - padding: .2em; - text-align: right; - text-decoration: none; -} -.ui-datepicker .ui-datepicker-buttonpane { - background-image: none; - margin: .7em 0 0 0; - padding: 0 .2em; - border-left: 0; - border-right: 0; - border-bottom: 0; -} -.ui-datepicker .ui-datepicker-buttonpane button { - float: right; - margin: .5em .2em .4em; - cursor: pointer; - padding: .2em .6em .3em .6em; - width: auto; - overflow: visible; -} -.ui-datepicker .ui-datepicker-buttonpane button.ui-datepicker-current { - float: left; -} - -/* with multiple calendars */ -.ui-datepicker.ui-datepicker-multi { - width: auto; -} -.ui-datepicker-multi .ui-datepicker-group { - float: left; -} -.ui-datepicker-multi .ui-datepicker-group table { - width: 95%; - margin: 0 auto .4em; -} -.ui-datepicker-multi-2 .ui-datepicker-group { - width: 50%; -} -.ui-datepicker-multi-3 .ui-datepicker-group { - width: 33.3%; -} -.ui-datepicker-multi-4 .ui-datepicker-group { - width: 25%; -} -.ui-datepicker-multi .ui-datepicker-group-last .ui-datepicker-header, -.ui-datepicker-multi .ui-datepicker-group-middle .ui-datepicker-header { - border-left-width: 0; -} -.ui-datepicker-multi .ui-datepicker-buttonpane { - clear: left; -} -.ui-datepicker-row-break { - clear: both; - width: 100%; - font-size: 0; -} - -/* RTL support */ -.ui-datepicker-rtl { - direction: rtl; -} -.ui-datepicker-rtl .ui-datepicker-prev { - right: 2px; - left: auto; -} -.ui-datepicker-rtl .ui-datepicker-next { - left: 2px; - right: auto; -} -.ui-datepicker-rtl .ui-datepicker-prev:hover { - right: 1px; - left: auto; -} -.ui-datepicker-rtl .ui-datepicker-next:hover { - left: 1px; - right: auto; -} -.ui-datepicker-rtl .ui-datepicker-buttonpane { - clear: right; -} -.ui-datepicker-rtl .ui-datepicker-buttonpane button { - float: left; -} -.ui-datepicker-rtl .ui-datepicker-buttonpane button.ui-datepicker-current, -.ui-datepicker-rtl .ui-datepicker-group { - float: right; -} -.ui-datepicker-rtl .ui-datepicker-group-last .ui-datepicker-header, -.ui-datepicker-rtl .ui-datepicker-group-middle .ui-datepicker-header { - border-right-width: 0; - border-left-width: 1px; -} -.ui-dialog { - position: absolute; - top: 0; - left: 0; - padding: .2em; - outline: 0; -} -.ui-dialog .ui-dialog-titlebar { - padding: .4em 1em; - position: relative; -} -.ui-dialog .ui-dialog-title { - float: left; - margin: .1em 0; - white-space: nowrap; - width: 90%; - overflow: hidden; - text-overflow: ellipsis; -} -.ui-dialog .ui-dialog-titlebar-close { - position: absolute; - right: .3em; - top: 50%; - width: 21px; - margin: -10px 0 0 0; - padding: 1px; - height: 20px; -} -.ui-dialog .ui-dialog-content { - position: relative; - border: 0; - padding: .5em 1em; - background: none; - overflow: auto; -} -.ui-dialog .ui-dialog-buttonpane { - text-align: left; - border-width: 1px 0 0 0; - background-image: none; - margin-top: .5em; - padding: .3em 1em .5em .4em; -} -.ui-dialog .ui-dialog-buttonpane .ui-dialog-buttonset { - float: right; -} -.ui-dialog .ui-dialog-buttonpane button { - margin: .5em .4em .5em 0; - cursor: pointer; -} -.ui-dialog .ui-resizable-se { - width: 12px; - height: 12px; - right: -5px; - bottom: -5px; - background-position: 16px 16px; -} -.ui-draggable .ui-dialog-titlebar { - cursor: move; -} -.ui-menu { - list-style: none; - padding: 2px; - margin: 0; - display: block; - outline: none; -} -.ui-menu .ui-menu { - margin-top: -3px; - position: absolute; -} -.ui-menu .ui-menu-item { - margin: 0; - padding: 0; - width: 100%; - /* support: IE10, see #8844 */ - list-style-image: url(data:image/gif;base64,R0lGODlhAQABAIAAAAAAAP///yH5BAEAAAAALAAAAAABAAEAAAIBRAA7); -} -.ui-menu .ui-menu-divider { - margin: 5px -2px 5px -2px; - height: 0; - font-size: 0; - line-height: 0; - border-width: 1px 0 0 0; -} -.ui-menu .ui-menu-item a { - text-decoration: none; - display: block; - padding: 2px .4em; - line-height: 1.5; - min-height: 0; /* support: IE7 */ - font-weight: normal; -} -.ui-menu .ui-menu-item a.ui-state-focus, -.ui-menu .ui-menu-item a.ui-state-active { - font-weight: normal; - margin: -1px; -} - -.ui-menu .ui-state-disabled { - font-weight: normal; - margin: .4em 0 .2em; - line-height: 1.5; -} -.ui-menu .ui-state-disabled a { - cursor: default; -} - -/* icon support */ -.ui-menu-icons { - position: relative; -} -.ui-menu-icons .ui-menu-item a { - position: relative; - padding-left: 2em; -} - -/* left-aligned */ -.ui-menu .ui-icon { - position: absolute; - top: .2em; - left: .2em; -} - -/* right-aligned */ -.ui-menu .ui-menu-icon { - position: static; - float: right; -} -.ui-progressbar { - height: 2em; - text-align: left; - overflow: hidden; -} -.ui-progressbar .ui-progressbar-value { - margin: -1px; - height: 100%; -} -.ui-progressbar .ui-progressbar-overlay { - background: url("images/animated-overlay.gif"); - height: 100%; - filter: alpha(opacity=25); - opacity: 0.25; -} -.ui-progressbar-indeterminate .ui-progressbar-value { - background-image: none; -} -.ui-slider { - position: relative; - text-align: left; -} -.ui-slider .ui-slider-handle { - position: absolute; - z-index: 2; - width: 1.2em; - height: 1.2em; - cursor: default; -} -.ui-slider .ui-slider-range { - position: absolute; - z-index: 1; - font-size: .7em; - display: block; - border: 0; - background-position: 0 0; -} - -/* For IE8 - See #6727 */ -.ui-slider.ui-state-disabled .ui-slider-handle, -.ui-slider.ui-state-disabled .ui-slider-range { - filter: inherit; -} - -.ui-slider-horizontal { - height: .8em; -} -.ui-slider-horizontal .ui-slider-handle { - top: -.3em; - margin-left: -.6em; -} -.ui-slider-horizontal .ui-slider-range { - top: 0; - height: 100%; -} -.ui-slider-horizontal .ui-slider-range-min { - left: 0; -} -.ui-slider-horizontal .ui-slider-range-max { - right: 0; -} - -.ui-slider-vertical { - width: .8em; - height: 100px; -} -.ui-slider-vertical .ui-slider-handle { - left: -.3em; - margin-left: 0; - margin-bottom: -.6em; -} -.ui-slider-vertical .ui-slider-range { - left: 0; - width: 100%; -} -.ui-slider-vertical .ui-slider-range-min { - bottom: 0; -} -.ui-slider-vertical .ui-slider-range-max { - top: 0; -} -.ui-spinner { - position: relative; - display: inline-block; - overflow: hidden; - padding: 0; - vertical-align: middle; -} -.ui-spinner-input { - border: none; - background: none; - color: inherit; - padding: 0; - margin: .2em 0; - vertical-align: middle; - margin-left: .4em; - margin-right: 22px; -} -.ui-spinner-button { - width: 16px; - height: 50%; - font-size: .5em; - padding: 0; - margin: 0; - text-align: center; - position: absolute; - cursor: default; - display: block; - overflow: hidden; - right: 0; -} -/* more specificity required here to overide default borders */ -.ui-spinner a.ui-spinner-button { - border-top: none; - border-bottom: none; - border-right: none; -} -/* vertical centre icon */ -.ui-spinner .ui-icon { - position: absolute; - margin-top: -8px; - top: 50%; - left: 0; -} -.ui-spinner-up { - top: 0; -} -.ui-spinner-down { - bottom: 0; -} - -/* TR overrides */ -.ui-spinner .ui-icon-triangle-1-s { - /* need to fix icons sprite */ - background-position: -65px -16px; -} -.ui-tabs { - position: relative;/* position: relative prevents IE scroll bug (element with position: relative inside container with overflow: auto appear as "fixed") */ - padding: .2em; -} -.ui-tabs .ui-tabs-nav { - margin: 0; - padding: .2em .2em 0; -} -.ui-tabs .ui-tabs-nav li { - list-style: none; - float: left; - position: relative; - top: 0; - margin: 1px .2em 0 0; - border-bottom-width: 0; - padding: 0; - white-space: nowrap; -} -.ui-tabs .ui-tabs-nav li a { - float: left; - padding: .5em 1em; - text-decoration: none; -} -.ui-tabs .ui-tabs-nav li.ui-tabs-active { - margin-bottom: -1px; - padding-bottom: 1px; -} -.ui-tabs .ui-tabs-nav li.ui-tabs-active a, -.ui-tabs .ui-tabs-nav li.ui-state-disabled a, -.ui-tabs .ui-tabs-nav li.ui-tabs-loading a { - cursor: text; -} -.ui-tabs .ui-tabs-nav li a, /* first selector in group seems obsolete, but required to overcome bug in Opera applying cursor: text overall if defined elsewhere... */ -.ui-tabs-collapsible .ui-tabs-nav li.ui-tabs-active a { - cursor: pointer; -} -.ui-tabs .ui-tabs-panel { - display: block; - border-width: 0; - padding: 1em 1.4em; - background: none; -} -.ui-tooltip { - padding: 8px; - position: absolute; - z-index: 9999; - max-width: 300px; - -webkit-box-shadow: 0 0 5px #aaa; - box-shadow: 0 0 5px #aaa; -} -body .ui-tooltip { - border-width: 2px; -} - -/* Component containers -----------------------------------*/ -.ui-widget { - font-family: "Helvetica Neue", Helvetica, Arial, sans-serif; - font-size: 12px; -} -.ui-widget .ui-widget { - font-size: 1em; -} -.ui-widget input, -.ui-widget select, -.ui-widget textarea, -.ui-widget button { - font-family: "Helvetica Neue", Helvetica, Arial, sans-serif; - font-size: 1em; -} -.ui-widget-content { - border: 1px solid #aaaaaa; - background: #F9F9F9 url(images/ui-bg_flat_75_F9F9F9_40x100.png) 50% 50% repeat-x; - color: #333333; -} -.ui-widget-content a { - color: #333333; -} -.ui-widget-header { - border: 1px solid #eab791; - background: #f39922 url(images/ui-bg_highlight-soft_100_f39922_1x100.png) 50% 50% repeat-x; - color: #FFF; - font-weight: bold; -} -.ui-widget-header a { - color: #FFF; -} - -/* Interaction states -----------------------------------*/ -.ui-state-default, -.ui-widget-content .ui-state-default, -.ui-widget-header .ui-state-default { - border: 1px solid #d3d3d3; - background: #FFF url(images/ui-bg_highlight-hard_75_FFF_1x100.png) 50% 50% repeat-x; - font-weight: normal; - color: #555555; -} -.ui-state-default a, -.ui-state-default a:link, -.ui-state-default a:visited { - color: #555555; - text-decoration: none; -} -.ui-state-hover, -.ui-widget-content .ui-state-hover, -.ui-widget-header .ui-state-hover, -.ui-state-focus, -.ui-widget-content .ui-state-focus, -.ui-widget-header .ui-state-focus { - border: 1px solid #999999; - background: #f39922 url(images/ui-bg_highlight-soft_75_f39922_1x100.png) 50% 50% repeat-x; - font-weight: normal; - color: #fff; -} -.ui-state-hover a, -.ui-state-hover a:hover, -.ui-state-hover a:link, -.ui-state-hover a:visited { - color: #fff; - text-decoration: none; -} -.ui-state-active, -.ui-widget-content .ui-state-active, -.ui-widget-header .ui-state-active { - border: 1px solid #aaaaaa; - background: #f39922 url(images/ui-bg_highlight-soft_65_f39922_1x100.png) 50% 50% repeat-x; - font-weight: normal; - color: #fff; -} -.ui-state-active a, -.ui-state-active a:link, -.ui-state-active a:visited { - color: #fff; - text-decoration: none; -} - -/* Interaction Cues -----------------------------------*/ -.ui-state-highlight, -.ui-widget-content .ui-state-highlight, -.ui-widget-header .ui-state-highlight { - border: 1px solid #fcefa1; - background: #fbf9ee url(images/ui-bg_glass_55_fbf9ee_1x400.png) 50% 50% repeat-x; - color: #363636; -} -.ui-state-highlight a, -.ui-widget-content .ui-state-highlight a, -.ui-widget-header .ui-state-highlight a { - color: #363636; -} -.ui-state-error, -.ui-widget-content .ui-state-error, -.ui-widget-header .ui-state-error { - border: 1px solid #cd0a0a; - background: #fef1ec url(images/ui-bg_glass_95_fef1ec_1x400.png) 50% 50% repeat-x; - color: #cd0a0a; -} -.ui-state-error a, -.ui-widget-content .ui-state-error a, -.ui-widget-header .ui-state-error a { - color: #cd0a0a; -} -.ui-state-error-text, -.ui-widget-content .ui-state-error-text, -.ui-widget-header .ui-state-error-text { - color: #cd0a0a; -} -.ui-priority-primary, -.ui-widget-content .ui-priority-primary, -.ui-widget-header .ui-priority-primary { - font-weight: bold; -} -.ui-priority-secondary, -.ui-widget-content .ui-priority-secondary, -.ui-widget-header .ui-priority-secondary { - opacity: .7; - filter:Alpha(Opacity=70); - font-weight: normal; -} -.ui-state-disabled, -.ui-widget-content .ui-state-disabled, -.ui-widget-header .ui-state-disabled { - opacity: .35; - filter:Alpha(Opacity=35); - background-image: none; -} -.ui-state-disabled .ui-icon { - filter:Alpha(Opacity=35); /* For IE8 - See #6059 */ -} - -/* Icons -----------------------------------*/ - -/* states and images */ -.ui-icon { - width: 16px; - height: 16px; -} -.ui-icon, -.ui-widget-content .ui-icon { - background-image: url(images/ui-icons_333333_256x240.png); -} -.ui-widget-header .ui-icon { - background-image: url(images/ui-icons_FFF_256x240.png); -} -.ui-state-default .ui-icon { - background-image: url(images/ui-icons_888888_256x240.png); -} -.ui-state-hover .ui-icon, -.ui-state-focus .ui-icon { - background-image: url(images/ui-icons_454545_256x240.png); -} -.ui-state-active .ui-icon { - background-image: url(images/ui-icons_fff_256x240.png); -} -.ui-state-highlight .ui-icon { - background-image: url(images/ui-icons_2e83ff_256x240.png); -} -.ui-state-error .ui-icon, -.ui-state-error-text .ui-icon { - background-image: url(images/ui-icons_cd0a0a_256x240.png); -} - -/* positioning */ -.ui-icon-blank { background-position: 16px 16px; } -.ui-icon-carat-1-n { background-position: 0 0; } -.ui-icon-carat-1-ne { background-position: -16px 0; } -.ui-icon-carat-1-e { background-position: -32px 0; } -.ui-icon-carat-1-se { background-position: -48px 0; } -.ui-icon-carat-1-s { background-position: -64px 0; } -.ui-icon-carat-1-sw { background-position: -80px 0; } -.ui-icon-carat-1-w { background-position: -96px 0; } -.ui-icon-carat-1-nw { background-position: -112px 0; } -.ui-icon-carat-2-n-s { background-position: -128px 0; } -.ui-icon-carat-2-e-w { background-position: -144px 0; } -.ui-icon-triangle-1-n { background-position: 0 -16px; } -.ui-icon-triangle-1-ne { background-position: -16px -16px; } -.ui-icon-triangle-1-e { background-position: -32px -16px; } -.ui-icon-triangle-1-se { background-position: -48px -16px; } -.ui-icon-triangle-1-s { background-position: -64px -16px; } -.ui-icon-triangle-1-sw { background-position: -80px -16px; } -.ui-icon-triangle-1-w { background-position: -96px -16px; } -.ui-icon-triangle-1-nw { background-position: -112px -16px; } -.ui-icon-triangle-2-n-s { background-position: -128px -16px; } -.ui-icon-triangle-2-e-w { background-position: -144px -16px; } -.ui-icon-arrow-1-n { background-position: 0 -32px; } -.ui-icon-arrow-1-ne { background-position: -16px -32px; } -.ui-icon-arrow-1-e { background-position: -32px -32px; } -.ui-icon-arrow-1-se { background-position: -48px -32px; } -.ui-icon-arrow-1-s { background-position: -64px -32px; } -.ui-icon-arrow-1-sw { background-position: -80px -32px; } -.ui-icon-arrow-1-w { background-position: -96px -32px; } -.ui-icon-arrow-1-nw { background-position: -112px -32px; } -.ui-icon-arrow-2-n-s { background-position: -128px -32px; } -.ui-icon-arrow-2-ne-sw { background-position: -144px -32px; } -.ui-icon-arrow-2-e-w { background-position: -160px -32px; } -.ui-icon-arrow-2-se-nw { background-position: -176px -32px; } -.ui-icon-arrowstop-1-n { background-position: -192px -32px; } -.ui-icon-arrowstop-1-e { background-position: -208px -32px; } -.ui-icon-arrowstop-1-s { background-position: -224px -32px; } -.ui-icon-arrowstop-1-w { background-position: -240px -32px; } -.ui-icon-arrowthick-1-n { background-position: 0 -48px; } -.ui-icon-arrowthick-1-ne { background-position: -16px -48px; } -.ui-icon-arrowthick-1-e { background-position: -32px -48px; } -.ui-icon-arrowthick-1-se { background-position: -48px -48px; } -.ui-icon-arrowthick-1-s { background-position: -64px -48px; } -.ui-icon-arrowthick-1-sw { background-position: -80px -48px; } -.ui-icon-arrowthick-1-w { background-position: -96px -48px; } -.ui-icon-arrowthick-1-nw { background-position: -112px -48px; } -.ui-icon-arrowthick-2-n-s { background-position: -128px -48px; } -.ui-icon-arrowthick-2-ne-sw { background-position: -144px -48px; } -.ui-icon-arrowthick-2-e-w { background-position: -160px -48px; } -.ui-icon-arrowthick-2-se-nw { background-position: -176px -48px; } -.ui-icon-arrowthickstop-1-n { background-position: -192px -48px; } -.ui-icon-arrowthickstop-1-e { background-position: -208px -48px; } -.ui-icon-arrowthickstop-1-s { background-position: -224px -48px; } -.ui-icon-arrowthickstop-1-w { background-position: -240px -48px; } -.ui-icon-arrowreturnthick-1-w { background-position: 0 -64px; } -.ui-icon-arrowreturnthick-1-n { background-position: -16px -64px; } -.ui-icon-arrowreturnthick-1-e { background-position: -32px -64px; } -.ui-icon-arrowreturnthick-1-s { background-position: -48px -64px; } -.ui-icon-arrowreturn-1-w { background-position: -64px -64px; } -.ui-icon-arrowreturn-1-n { background-position: -80px -64px; } -.ui-icon-arrowreturn-1-e { background-position: -96px -64px; } -.ui-icon-arrowreturn-1-s { background-position: -112px -64px; } -.ui-icon-arrowrefresh-1-w { background-position: -128px -64px; } -.ui-icon-arrowrefresh-1-n { background-position: -144px -64px; } -.ui-icon-arrowrefresh-1-e { background-position: -160px -64px; } -.ui-icon-arrowrefresh-1-s { background-position: -176px -64px; } -.ui-icon-arrow-4 { background-position: 0 -80px; } -.ui-icon-arrow-4-diag { background-position: -16px -80px; } -.ui-icon-extlink { background-position: -32px -80px; } -.ui-icon-newwin { background-position: -48px -80px; } -.ui-icon-refresh { background-position: -64px -80px; } -.ui-icon-shuffle { background-position: -80px -80px; } -.ui-icon-transfer-e-w { background-position: -96px -80px; } -.ui-icon-transferthick-e-w { background-position: -112px -80px; } -.ui-icon-folder-collapsed { background-position: 0 -96px; } -.ui-icon-folder-open { background-position: -16px -96px; } -.ui-icon-document { background-position: -32px -96px; } -.ui-icon-document-b { background-position: -48px -96px; } -.ui-icon-note { background-position: -64px -96px; } -.ui-icon-mail-closed { background-position: -80px -96px; } -.ui-icon-mail-open { background-position: -96px -96px; } -.ui-icon-suitcase { background-position: -112px -96px; } -.ui-icon-comment { background-position: -128px -96px; } -.ui-icon-person { background-position: -144px -96px; } -.ui-icon-print { background-position: -160px -96px; } -.ui-icon-trash { background-position: -176px -96px; } -.ui-icon-locked { background-position: -192px -96px; } -.ui-icon-unlocked { background-position: -208px -96px; } -.ui-icon-bookmark { background-position: -224px -96px; } -.ui-icon-tag { background-position: -240px -96px; } -.ui-icon-home { background-position: 0 -112px; } -.ui-icon-flag { background-position: -16px -112px; } -.ui-icon-calendar { background-position: -32px -112px; } -.ui-icon-cart { background-position: -48px -112px; } -.ui-icon-pencil { background-position: -64px -112px; } -.ui-icon-clock { background-position: -80px -112px; } -.ui-icon-disk { background-position: -96px -112px; } -.ui-icon-calculator { background-position: -112px -112px; } -.ui-icon-zoomin { background-position: -128px -112px; } -.ui-icon-zoomout { background-position: -144px -112px; } -.ui-icon-search { background-position: -160px -112px; } -.ui-icon-wrench { background-position: -176px -112px; } -.ui-icon-gear { background-position: -192px -112px; } -.ui-icon-heart { background-position: -208px -112px; } -.ui-icon-star { background-position: -224px -112px; } -.ui-icon-link { background-position: -240px -112px; } -.ui-icon-cancel { background-position: 0 -128px; } -.ui-icon-plus { background-position: -16px -128px; } -.ui-icon-plusthick { background-position: -32px -128px; } -.ui-icon-minus { background-position: -48px -128px; } -.ui-icon-minusthick { background-position: -64px -128px; } -.ui-icon-close { background-position: -80px -128px; } -.ui-icon-closethick { background-position: -96px -128px; } -.ui-icon-key { background-position: -112px -128px; } -.ui-icon-lightbulb { background-position: -128px -128px; } -.ui-icon-scissors { background-position: -144px -128px; } -.ui-icon-clipboard { background-position: -160px -128px; } -.ui-icon-copy { background-position: -176px -128px; } -.ui-icon-contact { background-position: -192px -128px; } -.ui-icon-image { background-position: -208px -128px; } -.ui-icon-video { background-position: -224px -128px; } -.ui-icon-script { background-position: -240px -128px; } -.ui-icon-alert { background-position: 0 -144px; } -.ui-icon-info { background-position: -16px -144px; } -.ui-icon-notice { background-position: -32px -144px; } -.ui-icon-help { background-position: -48px -144px; } -.ui-icon-check { background-position: -64px -144px; } -.ui-icon-bullet { background-position: -80px -144px; } -.ui-icon-radio-on { background-position: -96px -144px; } -.ui-icon-radio-off { background-position: -112px -144px; } -.ui-icon-pin-w { background-position: -128px -144px; } -.ui-icon-pin-s { background-position: -144px -144px; } -.ui-icon-play { background-position: 0 -160px; } -.ui-icon-pause { background-position: -16px -160px; } -.ui-icon-seek-next { background-position: -32px -160px; } -.ui-icon-seek-prev { background-position: -48px -160px; } -.ui-icon-seek-end { background-position: -64px -160px; } -.ui-icon-seek-start { background-position: -80px -160px; } -/* ui-icon-seek-first is deprecated, use ui-icon-seek-start instead */ -.ui-icon-seek-first { background-position: -80px -160px; } -.ui-icon-stop { background-position: -96px -160px; } -.ui-icon-eject { background-position: -112px -160px; } -.ui-icon-volume-off { background-position: -128px -160px; } -.ui-icon-volume-on { background-position: -144px -160px; } -.ui-icon-power { background-position: 0 -176px; } -.ui-icon-signal-diag { background-position: -16px -176px; } -.ui-icon-signal { background-position: -32px -176px; } -.ui-icon-battery-0 { background-position: -48px -176px; } -.ui-icon-battery-1 { background-position: -64px -176px; } -.ui-icon-battery-2 { background-position: -80px -176px; } -.ui-icon-battery-3 { background-position: -96px -176px; } -.ui-icon-circle-plus { background-position: 0 -192px; } -.ui-icon-circle-minus { background-position: -16px -192px; } -.ui-icon-circle-close { background-position: -32px -192px; } -.ui-icon-circle-triangle-e { background-position: -48px -192px; } -.ui-icon-circle-triangle-s { background-position: -64px -192px; } -.ui-icon-circle-triangle-w { background-position: -80px -192px; } -.ui-icon-circle-triangle-n { background-position: -96px -192px; } -.ui-icon-circle-arrow-e { background-position: -112px -192px; } -.ui-icon-circle-arrow-s { background-position: -128px -192px; } -.ui-icon-circle-arrow-w { background-position: -144px -192px; } -.ui-icon-circle-arrow-n { background-position: -160px -192px; } -.ui-icon-circle-zoomin { background-position: -176px -192px; } -.ui-icon-circle-zoomout { background-position: -192px -192px; } -.ui-icon-circle-check { background-position: -208px -192px; } -.ui-icon-circlesmall-plus { background-position: 0 -208px; } -.ui-icon-circlesmall-minus { background-position: -16px -208px; } -.ui-icon-circlesmall-close { background-position: -32px -208px; } -.ui-icon-squaresmall-plus { background-position: -48px -208px; } -.ui-icon-squaresmall-minus { background-position: -64px -208px; } -.ui-icon-squaresmall-close { background-position: -80px -208px; } -.ui-icon-grip-dotted-vertical { background-position: 0 -224px; } -.ui-icon-grip-dotted-horizontal { background-position: -16px -224px; } -.ui-icon-grip-solid-vertical { background-position: -32px -224px; } -.ui-icon-grip-solid-horizontal { background-position: -48px -224px; } -.ui-icon-gripsmall-diagonal-se { background-position: -64px -224px; } -.ui-icon-grip-diagonal-se { background-position: -80px -224px; } - - -/* Misc visuals -----------------------------------*/ - -/* Corner radius */ -.ui-corner-all, -.ui-corner-top, -.ui-corner-left, -.ui-corner-tl { - border-top-left-radius: 4px; -} -.ui-corner-all, -.ui-corner-top, -.ui-corner-right, -.ui-corner-tr { - border-top-right-radius: 4px; -} -.ui-corner-all, -.ui-corner-bottom, -.ui-corner-left, -.ui-corner-bl { - border-bottom-left-radius: 4px; -} -.ui-corner-all, -.ui-corner-bottom, -.ui-corner-right, -.ui-corner-br { - border-bottom-right-radius: 4px; -} - -/* Overlays */ -.ui-widget-overlay { - background: #aaaaaa url(images/ui-bg_flat_0_aaaaaa_40x100.png) 50% 50% repeat-x; - opacity: .3; - filter: Alpha(Opacity=30); -} -.ui-widget-shadow { - margin: -8px 0 0 -8px; - padding: 8px; - background: #aaaaaa url(images/ui-bg_flat_0_aaaaaa_40x100.png) 50% 50% repeat-x; - opacity: .3; - filter: Alpha(Opacity=30); - border-radius: 8px; -} diff --git a/templates/admin/default/assets/js/main.js b/templates/admin/default/assets/js/main.js index ad99d87af..c8fc1a7b7 100644 --- a/templates/admin/default/assets/js/main.js +++ b/templates/admin/default/assets/js/main.js @@ -4,16 +4,16 @@ // -- Init datepicker -- if($('.date').length){ - $('.date').datepicker(); + //$('.date').datepicker(); } // -- Init tablesorter -- - if($('.tablesorter').length){ + /*if($('.tablesorter').length){ $('.tablesorter').tablesorter({ widgets: ["filter", "stickyHeaders"], widthFixed : false, widgetOptions : { - filter_cssFilter : 'input-medium', + filter_cssFilter : 'input-medium form-control', filter_formatter : { 2 : function($cell, indx){ @@ -38,7 +38,7 @@ } } }); - } + }*/ // -- Effect description if($('[name=effect]').length){ diff --git a/templates/admin/default/assets/less/main.less b/templates/admin/default/assets/less/main.less index 7ad14e013..3498441a2 100644 --- a/templates/admin/default/assets/less/main.less +++ b/templates/admin/default/assets/less/main.less @@ -2,5 +2,4 @@ @import "bootstrap/bootstrap.less"; /* Thelia Admin */ -@import "thelia/thelia.less"; -// @import "thelia/responsive.less"; \ No newline at end of file +@import "thelia/thelia.less"; \ No newline at end of file diff --git a/templates/admin/default/assets/less/thelia/variables.less b/templates/admin/default/assets/less/thelia/variables.less index dec523afc..159d76b37 100755 --- a/templates/admin/default/assets/less/thelia/variables.less +++ b/templates/admin/default/assets/less/thelia/variables.less @@ -44,4 +44,9 @@ // Used for a bird's eye view of components dependent on the z-axis // Try to avoid customizing these :) -@zindex-dropdown: 1005; \ No newline at end of file +@zindex-dropdown: 1005; + +// Forms +// ------------------------- + +@input-border-focus: @brand-primary; \ No newline at end of file diff --git a/templates/admin/default/coupon-create.html b/templates/admin/default/coupon-create.html index 6f7126e6d..7cb31ee09 100755 --- a/templates/admin/default/coupon-create.html +++ b/templates/admin/default/coupon-create.html @@ -20,9 +20,9 @@ {/form} -{/block} {include file='includes/confirmation-modal.html'} +{/block} {block name="javascript-initialization"} {javascripts file='assets/bootstrap-datepicker/js/bootstrap-datepicker.js'} diff --git a/templates/admin/default/coupon-list.html b/templates/admin/default/coupon-list.html index 89ea84e5a..331b97231 100755 --- a/templates/admin/default/coupon-list.html +++ b/templates/admin/default/coupon-list.html @@ -15,8 +15,8 @@

Coupons : List of coupons

-
-
+
+
@@ -47,8 +47,8 @@ @@ -57,8 +57,8 @@ @@ -67,8 +67,8 @@ @@ -76,8 +76,8 @@ -
-
+
+
List of enabled coupons @@ -37,8 +37,8 @@
18/10/2013 49 - Edit - Disable + Edit + Disable
05/09/2013 20 - Edit - Disable + Edit + Disable
03/12/2013 9 - Edit - Disable + Edit + Disable
25/01/2013 4 - Edit - Disable + Edit + Disable
@@ -108,8 +108,8 @@ @@ -118,8 +118,8 @@ @@ -128,8 +128,8 @@ @@ -138,41 +138,36 @@ -{/block} {include file='includes/confirmation-modal.html' id="disable" message="{intl l='Do you really want to disable this element ?'}"} {include file='includes/confirmation-modal.html' id="enable" message="{intl l='Do you really want to enable this element ?'}"} +{/block} + + {block name="javascript-initialization"} - {include file='includes/js.inc.html'} - - {stylesheets file='../assets/css/jqueryui/custom-theme/*' filters='less,cssembed'} - - {/stylesheets} - - - - {javascripts file='../assets/bootstrap-editable/js/bootstrap-editable.js'} + + {javascripts file='assets/bootstrap-editable/js/bootstrap-editable.js'} {/javascripts} - {javascripts file='../assets/js/tablesorter/jquery.tablesorter.min.js'} + {javascripts file='assets/js/tablesorter/jquery.tablesorter.min.js'} {/javascripts} - {javascripts file='../assets/js/tablesorter/jquery.metadata.js'} + {javascripts file='assets/js/tablesorter/jquery.metadata.js'} {/javascripts} - {javascripts file='../assets/js/tablesorter/jquery.tablesorter.widgets.js'} + {javascripts file='assets/js/tablesorter/jquery.tablesorter.widgets.js'} {/javascripts} - {javascripts file='../assets/js/tablesorter/jquery.tablesorter.widgets-filter-formatter.js'} + {javascripts file='assets/js/tablesorter/jquery.tablesorter.widgets-filter-formatter.js'} {/javascripts} - {javascripts file='../assets/js/main.js'} + {javascripts file='assets/js/main.js'} {/javascripts} {/block} diff --git a/templates/admin/default/coupon-read.html b/templates/admin/default/coupon-read.html index 67cb1a4a1..f187df7a0 100755 --- a/templates/admin/default/coupon-read.html +++ b/templates/admin/default/coupon-read.html @@ -16,11 +16,11 @@ -
-
+
+
{loop type="coupon" name="read_coupon" id=1 backend_context="true"}
- + {if #IS_ENABLED}{else}This coupon is disabled, you can enable to the bottom of this form.{/if}
@@ -91,7 +91,7 @@
@@ -111,9 +111,10 @@ -{/block} -{include file='includes/confirmation-modal.html'} +{include file='includes/confirmation-modal.html' id="enable" message="{intl l='Do you really want to enable this element ?'}"} + +{/block} {block name="javascript-initialization"} {javascripts file='assets/js/main.js'} diff --git a/templates/admin/default/coupon/form.html b/templates/admin/default/coupon/form.html index a6131922b..452eff0a6 100644 --- a/templates/admin/default/coupon/form.html +++ b/templates/admin/default/coupon/form.html @@ -1,8 +1,8 @@ {$thelia_page_css_file = "assets/bootstrap-editable/css/bootstrap-editable.css"} {include file='includes/notifications.html' message=$general_error} -
-
+
+
{form_hidden_fields form=$form} @@ -16,22 +16,24 @@
+
+
{form_field form=$form field='code'} - + {if $error}{$message}{/if} {/form_field}
-
+
{form_field form=$form field='title'} - + {if $error}{$message}{/if} {/form_field}
-
+
-
+
-
+
-
+
-
+
{form_field form=$form field='expirationDate'} @@ -82,26 +84,26 @@
-
+
{form_field form=$form field='maxUsage'} - + {if $error}{$message}{/if} {/form_field}
-
+
-
-
+
+
{form_field form=$form field='effect'} - @@ -112,29 +114,29 @@
-
-
+
+
{form_field form=$form field='amount'} - + {if $error}{$message}{/if} {/form_field}
- {*
*} - {**} +
+ {*form_field form=$form field='category'*} - {**} + {*if $error}{$message}{/if}*} {*/form_field*} - {*
*} +
-
+
{form_field form=$form field='shortDescription'} @@ -142,29 +144,31 @@ {/form_field}
- +
+
-
- - {form_field form=$form field='description'} - - {if $error}{$message}{/if} - {/form_field} +
+ + {form_field form=$form field='description'} + + {if $error}{$message}{/if} + {/form_field} +
+ +
- -
-
-
+
+
List of disabled coupons @@ -98,8 +98,8 @@
18/10/2013 49 - Edit - Enabled + Edit + Enabled
05/09/2013 49 - Edit - Enabled + Edit + Enabled
03/12/2013 49 - Edit - Enabled + Edit + Enabled
25/01/2013 49 - Edit - Enabled + Edit + Enabled
Conditions of application -
    +
    • Total cart supperior to 400 €
    • OR
    • At least 4 products
      • @@ -101,8 +101,8 @@
Actions - Edit - Enabled + Edit + Enabled
@@ -181,8 +185,8 @@ @@ -190,8 +194,8 @@ @@ -199,8 +203,8 @@ @@ -208,10 +212,10 @@ -
-
+
+
-
+
-
+
- - -
-
+
-
- -
- € - - +
+
+ +
+
+ + € +
+
+ + + +
+
+ +
+
+ +
-
- -
- - - +
+
+ +
+
+
- - -
- - - -
Rules - - + +
is superior or equals to 300 € - Edit - Delete + Edit + Delete
is equals to 12 - Chaussettes rouges - Edit - Delete + Edit + Delete
is inferior or equals to 12/02/2014 - Edit - Delete + Edit + Delete
- - - - - - - - - -
Categories list
+
+
+ + + + + + + + + + +
Categories list
+
diff --git a/templates/admin/default/includes/confirmation-modal.html b/templates/admin/default/includes/confirmation-modal.html index 45ae030c8..957960416 100644 --- a/templates/admin/default/includes/confirmation-modal.html +++ b/templates/admin/default/includes/confirmation-modal.html @@ -5,28 +5,32 @@ - message : modal message (default Do you really want to delete this element ?) *} {block name="confirmation-modal"} -