diff --git a/library/Class/Admin/Skin.php b/library/Class/Admin/Skin.php index 960da7b51ec7a2216cb5af2fb6761bada75d3e12..05da59352a7bb3c46b7a54822a36b933e10bc0d9 100644 --- a/library/Class/Admin/Skin.php +++ b/library/Class/Admin/Skin.php @@ -143,6 +143,22 @@ class Class_Admin_Skin { } + public function renderFormCssOn($script_loader) { + $script_loader + ->addStyleSheets(array_merge([$this->_getSkinUrl() . 'form.css'], + $this->_getBaseStyleSheets())); + return $this; + } + + + public function renderJQueryCssOn($script_loader) { + $script_loader + ->addStyleSheets(array_merge([$this->_getSkinUrl() . 'jquery.css'], + $this->_getBaseStyleSheets())); + return $this; + } + + public function getStyleSheets() { return array_merge([$this->_getSkinUrl() . 'global.css'], $this->_getBaseStyleSheets()); diff --git a/library/ZendAfi/Form/Admin/News.php b/library/ZendAfi/Form/Admin/News.php index b3e227a1518e2039f594b82083328e34569452fb..6bc382ef072dbfffd535ce90d6e04b08c168fb45 100644 --- a/library/ZendAfi/Form/Admin/News.php +++ b/library/ZendAfi/Form/Admin/News.php @@ -111,8 +111,8 @@ class ZendAfi_Form_Admin_News extends ZendAfi_Form { ->addElement('ckeditor', 'description') ->addElement('textarea', 'tags', ['label' => $this->_('Tags séparés par des " ; "'), - 'rows' => 4, - 'cols' => 20]) + 'rows' => 1, + 'cols' => 40]) ->addElement('checkbox', 'indexation', ['label' => $this->_('Indexer l\'article dans le catalogue ?')]) @@ -275,7 +275,9 @@ EOT; protected function addDomainIndexation() { - return $this->addElement('domainSelect', 'domaine_ids') + return $this->addElement('domainSelect', + 'domaine_ids', + ['label' => $this->_('Domaines')]) ->addDisplayGroup(['tags', 'indexation', 'domaine_ids'], diff --git a/library/ZendAfi/View/Helper/Admin/RenderForm.php b/library/ZendAfi/View/Helper/Admin/RenderForm.php index c3152f581449d4ceb1304b425c5005b41dcf6a0b..b6ca3ca9fb4321b6608c66401b27c04a2fb220af 100644 --- a/library/ZendAfi/View/Helper/Admin/RenderForm.php +++ b/library/ZendAfi/View/Helper/Admin/RenderForm.php @@ -31,6 +31,8 @@ class ZendAfi_View_Helper_Admin_RenderForm extends ZendAfi_View_Helper_RenderFor $form->setAttrib('id', md5(implode($form->getElementsNames()))); Class_ScriptLoader::getInstance()->formToTabs('#' . $form->getId()); + Class_Admin_Skin::current()->renderFormCssOn(Class_ScriptLoader::getInstance()); + Class_Admin_Skin::current()->renderJQueryCssOn(Class_ScriptLoader::getInstance()); return parent::renderForm($form, $buttons); } diff --git a/public/admin/js/treeselect/treeselect.css b/public/admin/js/treeselect/treeselect.css index ca6a88f4a5391bb5463fc8748af7c2c5d42f4565..afa672b5eaf9e22d1617c4da433ec8c1689aa675 100644 --- a/public/admin/js/treeselect/treeselect.css +++ b/public/admin/js/treeselect/treeselect.css @@ -39,14 +39,6 @@ text-decoration: none; } -.ui-treeselect-selected-items > div, -.ui-treeselect-items-tree > div { - margin: 0px; - max-height: 300px; - overflow: auto; - padding: 0.5em !important; -} - .ui-treeselect-selected-items li:hover { cursor: pointer; } @@ -88,8 +80,7 @@ } .ui-treeselect-selected-items-inner { - padding: 10px; - overflow-y: auto; + margin-left: 1em; } .ui-treeselect-selected-items-inner ul { diff --git a/public/admin/skins/bokeh74/buttons.css b/public/admin/skins/bokeh74/buttons.css index 35bf25721cdadcca373cf7f5b474ae308bb68865..d04b72838543d2daa9c6cfd9ef9e7e244140278f 100644 --- a/public/admin/skins/bokeh74/buttons.css +++ b/public/admin/skins/bokeh74/buttons.css @@ -39,18 +39,4 @@ div.admin-buttons { .admin-button.image-loading-status { background-position: 1em; overflow: visible; -} - -.admin-form fieldset { - max-height: 400px; - overflow-y: auto; -} - -.admin-form select, -.admin-form input { - max-width: 300px; -} - -.admin-form table { - width: 100%; } \ No newline at end of file diff --git a/public/admin/skins/bokeh74/colors/blue.css b/public/admin/skins/bokeh74/colors/blue.css index 27752a76faee0a0918dc5e42473712bb661886a8..26d103ab556fb8804ae5fc5bdf0c1ef13c8625c8 100644 --- a/public/admin/skins/bokeh74/colors/blue.css +++ b/public/admin/skins/bokeh74/colors/blue.css @@ -3,4 +3,7 @@ --line-highlight: rgba(0, 80, 175, 0.15); --anchor: rgba(0, 80, 175, 0.6); --nav-background: rgba(0, 80, 175, 0.8); + --button-background: var(--anchor); + --button-background-highlight: var(--nav-background); + --button-disabled: var(--line-highlight); } \ No newline at end of file diff --git a/public/admin/skins/bokeh74/colors/green.css b/public/admin/skins/bokeh74/colors/green.css index d515786b59411c4754d5875b36a06df0a0697c38..8d186dbb08ca3decf6ceea2ef7f252c6a77a8d07 100644 --- a/public/admin/skins/bokeh74/colors/green.css +++ b/public/admin/skins/bokeh74/colors/green.css @@ -3,4 +3,7 @@ --line-highlight: rgba(7, 111, 21, 0.15); --anchor: rgba(7, 111, 21, 0.6); --nav-background: rgba(7, 111, 21, 0.8); + --button-background: var(--anchor); + --button-background-highlight: var(--nav-background); + --button-disabled: var(--line-highlight); } \ No newline at end of file diff --git a/public/admin/skins/bokeh74/colors/orange.css b/public/admin/skins/bokeh74/colors/orange.css index f22ca64c5018cbaffa74b2f760fda98d4172636f..9ee0e3c7b5f9a638fc2f464b996b368a2de7e324 100644 --- a/public/admin/skins/bokeh74/colors/orange.css +++ b/public/admin/skins/bokeh74/colors/orange.css @@ -3,4 +3,7 @@ --line-highlight: rgba(159, 104, 9, 0.15); --anchor: rgba(159, 104, 9, 0.6); --nav-background: rgba(159, 104, 9, 0.8); + --button-background: var(--anchor); + --button-background-highlight: var(--nav-background); + --button-disabled: var(--line-highlight); } \ No newline at end of file diff --git a/public/admin/skins/bokeh74/colors/purple.css b/public/admin/skins/bokeh74/colors/purple.css index 901eb5beb455d32470eba82081771c9cc6b2ff73..523a86df60037db40f151482fa3c7a6ca8b73c30 100644 --- a/public/admin/skins/bokeh74/colors/purple.css +++ b/public/admin/skins/bokeh74/colors/purple.css @@ -3,4 +3,7 @@ --line-highlight: rgba(127, 7, 113, 0.15); --anchor: rgba(127, 7, 113, 0.6); --nav-background: rgba(127, 7, 113, 0.8); + --button-background: var(--anchor); + --button-background-highlight: var(--nav-background); + --button-disabled: var(--line-highlight); } \ No newline at end of file diff --git a/public/admin/skins/bokeh74/colors/red.css b/public/admin/skins/bokeh74/colors/red.css index 3a7acca6e01c4c71138ed5a665c020e1a88a1012..ef42339cd6c4d5d3a1cc665e2104e1f8ac383275 100644 --- a/public/admin/skins/bokeh74/colors/red.css +++ b/public/admin/skins/bokeh74/colors/red.css @@ -3,4 +3,7 @@ --line-highlight: rgba(143, 17, 17, 0.15); --anchor: rgba(143, 17, 17, 0.6); --nav-background: rgba(143, 17, 17, 0.8); + --button-background: var(--anchor); + --button-background-highlight: var(--nav-background); + --button-disabled: var(--line-highlight); } \ No newline at end of file diff --git a/public/admin/skins/bokeh74/form.css b/public/admin/skins/bokeh74/form.css new file mode 100644 index 0000000000000000000000000000000000000000..68946ed09472d8bccee2c5dbf5364ee346394a8e --- /dev/null +++ b/public/admin/skins/bokeh74/form.css @@ -0,0 +1,48 @@ +.admin-form, +.admin-form a, +.admin-form h4, +.admin-form ul, +.admin-form fieldset, +.admin-form select, +.admin-form input { + color: var(--main-text); + background: var(--widget-background); +} + +.admin-form * { + size: 1em; +} + +.admin-form fieldset { + border: 0; + margin: 0; +} + +.admin-form select, +.admin-form td > input[type='text'] { + width: 10em; +} + +.admin-form tr { + line-height: 1.5em; +} + +.admin-form tr + tr { + border-top: 1px dotted var(--border-highlight); +} + +body .admin-form { + padding: 0; +} + +body .admin-form td.droite { + width: 15em; +} + +.admin-form fieldset { + overflow-y: auto; +} + +.admin-form table { + width: 100%; +} \ No newline at end of file diff --git a/public/admin/skins/bokeh74/jquery.css b/public/admin/skins/bokeh74/jquery.css new file mode 100644 index 0000000000000000000000000000000000000000..e8c9b08985baf0a5896d4f2058d3acc8df4a8938 --- /dev/null +++ b/public/admin/skins/bokeh74/jquery.css @@ -0,0 +1,160 @@ +body .ui-dialog , +body .ui-accordion-header, +body .ui-widget-content, +body .ui-widget-content .ui-state-active, +body .ui-widget-content .ui-state-default, +body .ui-accordion .ui-accordion-header, +body .ui-accordion .ui-accordion-header a { + color: var(--main-text); + background: var(--widget-background); +} + +body .ui-tabs .ui-tabs-panel { + background: var(--widget-shadow); +} + +body .ui-dialog-titlebar { + background: var(--nav-background); +} + +body .ui-dialog-titlebar .ui-dialog-title { + color: var(--nav-text); +} + +body .ui-treeselect-search span { + color: var(--main-text); +} + +body .ui-widget-content { + padding: 0; +} + +body .ui-dialog { + z-index: 1001; + position: fixed !important; + box-shadow: 0 0 15px var(--widget-shadow); +} + +body .ui-tabs .ui-tabs-panel, +body .ui-corner-all { + border: none; + border-radius: 0; +} + +body .ui-tabs .ui-tabs-nav > .ui-state-default > a { + background: var(--button-background); + color: var(--button); + cursor: pointer; + line-height: 1em; + margin: 0; + padding: 0.3em; + padding-left: 1.5em; + +} + +body .ui-tabs .ui-tabs-nav > .ui-tabs-active > a { + background: var(--button-background-highlight); + color: var(--button-highlight); +} + +body .ui-tabs .ui-tabs-nav > .ui-state-default > a:before { + background-image: url('icons/actions/ouvrir_24.png'); + background-repeat: no-repeat; + background-size: 0.8em; + background-position: left center; + content: ''; + filter: invert(); + display: inline; + height: 1em; + position: absolute; + width: 1em; + left: 5px; + top: 3px; + transition: all 0.4s; + transform: rotate(-90deg); +} + +body .ui-tabs .ui-tabs-nav > .ui-tabs-active > a:before { + transform: rotate(0deg); +} + +.ui-dialog .zend_form, +.ui-dialog fieldset { + margin: 0; + padding: 0; + text-align:center; +} + +.ui-dialog form label { + margin-right: 10px; +} + + +.ui-dialog fieldset td.gauche { + text-align: left; +} + +.ui-dialog fieldset td.droite { + text-align: right; +} + + +.ui-dialog fieldset legend { + text-align: left; +} + +.ui-dialog .zend_form dd{ + margin-left:0px; +} + +.ui-dialog .ajout-result { + text-align:center; +} + +.ui-dialog .ajout-result span { + display:block; + padding:5px; +} + +.ui-dialog .ajout-result a, .ui-dialog .ajout-result a:visited { + padding:5px; + text-decoration: underline; + border:none; + display:inline-block; +} + +.ui-dialog .ajout-result span a:first-child { + display:none; +} + +#opac-dialog div.popup-content { + padding: 5px; + max-width: 500px; + text-align: center; +} + +#opac-dialog div.popup-content p { + text-align: justify; +} + +#opac-dialog div.popup-content, +#opac-dialog div.popup-content * { + vertical-align: middle; +} + +#opac-dialog .boutons { + margin-top: 2em; + text-align: center; +} + +body .ui-accordion .ui-accordion-header { + border-radius: 0; + padding: 0.2em; + margin: 0; + padding-left: 1.5em; +} + + +body .ui-state-active .ui-accordion-header-icon { + transform: rotate(-90deg); +} \ No newline at end of file diff --git a/public/opac/css/global.css b/public/opac/css/global.css index 35f20fd8a64d7c1fbe9b90e325343c3d07831730..213bd1f4edc81324a539d0025b62c1cde607cafb 100644 --- a/public/opac/css/global.css +++ b/public/opac/css/global.css @@ -2547,8 +2547,6 @@ form.zend_form.reservation_pickup label { margin-bottom: 5px; } - - div table.tablesorter thead tr th { background-color: rgb(230, 238, 238); border: none; @@ -2556,19 +2554,6 @@ div table.tablesorter thead tr th { padding: 0px 15px 0px 0px; } -div.ui-dalog.ajout-panier { - background-color: #ccc; -} - -div.ui-dialog-titlebar { - font-size:1.2em; - color: inherit; -} - -.ui-dialog #opac-dialog { - font-size:1em; -} - .ajout-panier .zend_form { border: none; vertical-align:middle; @@ -2595,85 +2580,6 @@ div.ui-dialog-titlebar { margin-left:15px; } -.ui-dialog.ui-widget { - z-index: 1001; - position: fixed !important; - max-height: 90%; - max-width: 90%; - overflow: auto; - overflow-x: hidden; -} - -.ui-dialog .zend_form, -.ui-dialog fieldset { - margin:5px 0px; - text-align:center; -} - -.ui-dialog form label { - margin-right: 10px; -} - - -.ui-dialog fieldset td.gauche { - text-align: left; -} - -.ui-dialog fieldset td.droite { - text-align: right; -} - - -.ui-dialog fieldset legend { - text-align: left; -} - -.ui-dialog .zend_form dd{ - margin-left:0px; -} - -.ui-dialog .zend_form select { - font-size:1.250em; - width:350px; -} - -.ui-dialog input, -.ui-dialog button { - font-size: 1.2em; -} - -.ui-dialog h1{ - font-size:1.3em; -} - -.ui-dialog input:hover{ - color:black; -} - -.ui-dialog .ajout-result { - text-align:center; -} - -.ui-dialog .ajout-result span { - display:block; - padding:5px; - font-size:1.2em; -} - -.ui-dialog .ajout-result a, .ui-dialog .ajout-result a:visited { - padding:5px; - text-decoration: underline; - border:none; - display:inline-block; -} - -.ui-dialog .ajout-result span a:first-child { - display:none; -} - -.ui-widget-header { - color: black; -} div#ZFDebug { @@ -3258,59 +3164,6 @@ a.loan-export { padding: 0 20px; } - -#opac-dialog a.button { - display: inline-block; - text-align: center; - padding: 2px 5px; - border-radius: 5px; - line-height: 2em; - margin: 5px; - font-size: 1.2em; - font-weight: bold; - min-width: 60px; - text-transform: uppercase; - text-shadow: 0px -1px 1px rgba(0, 0, 0, 0.25); - cursor: pointer; - color: #FFF; - white-space: nowrap; -} - -#opac-dialog a.button.blue { - background: #008CFF; -} - - -#opac-dialog a.button.red { - background: #DF1B1B; -} - - -#opac-dialog a.button.blue:hover { - background: #004F8F; -} - - -#opac-dialog a.button.red:hover { - background: #8F1111; -} - -#opac-dialog div.popup-content { - padding: 5px; - max-width: 500px; - text-align: center; -} - -#opac-dialog div.popup-content p { - text-align: justify; -} - -#opac-dialog div.popup-content, -#opac-dialog div.popup-content * { - vertical-align: middle; -} - - .dilicom-action { padding: 5px; margin: 10px; @@ -3378,35 +3231,6 @@ dd.picture { width: 69%; } -#opac-dialog .boutons { - margin-top: 2em; - text-align: center; -} - - -#opac-dialog .boutons > div { - display: inline-block; - text-align: center; - background-color: rgba(0,0,0,0.6); - margin: 0.5em 10px; - max-width: 300px; - height:30px; -} - -#opac-dialog .boutons > div:hover { - background-color:rgba(0, 0 , 0 , 0.8); -} - -#opac-dialog .boutons > div a { - display: inline-block; - color:white; - vertical-align:middle; -} - -#opac-dialog .boutons .bouton td { - background:transparent!important; -} - div.bouton > * { visibility: hidden; } @@ -3667,4 +3491,4 @@ th.actions { .boutons { text-align: center; padding: 1em; -} +} \ No newline at end of file diff --git a/public/opac/js/input_connect_list/input_connect_list.css b/public/opac/js/input_connect_list/input_connect_list.css index 767f6a9285764948d4348f1a91e3dd71ab930a91..280512b338679ba414948888eac796ea551dbb9a 100644 --- a/public/opac/js/input_connect_list/input_connect_list.css +++ b/public/opac/js/input_connect_list/input_connect_list.css @@ -1,3 +1,7 @@ +.drag_and_drop_widget { + width: 550px; +} + .input_connect_list > div { border: 1px solid #738ead; display: inline-block; @@ -38,9 +42,9 @@ list-style: none; line-height: 2em; min-height: 2em; - min-width: 300px; - max-width: 500px; + width: 90%; padding: 0 5px; + overflow: hidden; } .show_inline { @@ -57,5 +61,4 @@ span.selected { margin: 0.2em; text-align: center; border: 1px solid #BBB; - background: #EEE; }