Commit b31c5027 authored by Ghislain Loas's avatar Ghislain Loas

wip on themes store

parent fd08cb7a
Pipeline #10656 passed with stage
in 47 minutes and 47 seconds
......@@ -35,7 +35,8 @@ class Class_Systeme_ModulesAccueil_Null {
$_isPackMobile = true,
$_defaultValues = [],
$_form,
$_view_helper;
$_view_helper,
$_in_menu = false;
/** @return boolean */
......@@ -201,6 +202,17 @@ class Class_Systeme_ModulesAccueil_Null {
}
public function beInMenu() {
$this->_in_menu = true;
return $this;
}
public function isInMenu() {
return $this->_in_menu;
}
public function getLink($params) {
return $this->getUrl($params);
}
......
......@@ -338,4 +338,16 @@ abstract class Class_Systeme_Widget_Abstract extends Class_Entity {
$this->_title = $title;
return $this;
}
public function beInMenu() {
$this->_getWidgetResources()->beInMenu();
return $this;
}
public function isInMenu() {
return $this->_getWidgetResources()->isInMenu();
}
}
......@@ -37,14 +37,9 @@ class ZendAfi_View_Helper_FonctionsAdmin extends ZendAfi_View_Helper_BaseHelper
$this->division = $division;
$this->_current_skin = Class_Admin_Skin::current();
if(!$this->_widget = (new Class_Systeme_Widget_Widget)
->setId($id_module)
->setProfileId($this->id_profil)
->load())
$this->_widget = (new Class_Systeme_Widget_Section)
->setId($id_module)
->setProfileId($this->id_profil)
->load();
if ( ! $this->_widget = $this->_loadWidget())
return '';
$this->_title = $this->_getTitle();
......@@ -71,6 +66,26 @@ class ZendAfi_View_Helper_FonctionsAdmin extends ZendAfi_View_Helper_BaseHelper
}
protected function _loadWidget() {
if($widget = (new Class_Systeme_Widget_Widget)
->setId($this->id_module)
->setProfileId($this->id_profil)
->load())
return $widget;
if((new Class_Systeme_Widget_Menu)
->setId($this->id_module)
->setProfileId($this->id_profil)
->load())
return null;
return (new Class_Systeme_Widget_Section)
->setId($this->id_module)
->setProfileId($this->id_profil)
->load();
}
protected function _getTitle() {
return $this->_widget
? $this->_widget->getTitle()
......
......@@ -94,7 +94,9 @@ class ZendAfi_View_Helper_Template_Base extends ZendAfi_View_Helper_BaseHelper {
protected function _getAdminTools() {
return $this->_view_helper->getAdminTools();
return ($this->_widget->isInMenu())
? ''
: $this->_view_helper->getAdminTools();
}
......
......@@ -705,6 +705,7 @@ footer {
.chili_widget.rech_simple button,
.chili_widget.rech_simple select {
height: 60px;
cursor: pointer;
}
.chili_widget.rech_simple form {
......@@ -736,7 +737,7 @@ footer {
height: auto;
}
.card-header.widget-header::after {
.chili_widget .card-header.widget-header::after {
content: ' ';
display: block;
height: 2px;
......@@ -744,7 +745,67 @@ footer {
width: 5%;
}
.py_4rem {
padding-left: 4rem !important;
padding-right: 4rem !important;
.mx_4rem {
margin-left: 4rem !important;
margin-right: 4rem !important;
}
.chili_footer_widget {
border-left: 1px solid var(--chili-white-bd) !important;
}
.chili_footer_widget.menu ul {
width: 100%;
}
.chili_network_list_widget .card .card-body {
padding: 0;
}
.chili_network_list_widget .card .card-footer,
.chili_network_list_widget .card .card-body .card-text {
display: none !important;
}
.chili_network_list_widget .list-group-item .card-title .text-secondary,
.chili_network_list_widget .list-group,
.chili_network_list_widget .list-group .card,
.chili_network_list_widget .list-group * {
color: var(--chili-white-t) !important;
padding: 0 !important;
margin: 0 !important;
display: inline-block !important;
line-height: 1em;
background-color: var(--front-transparent-background) !important;
box-shadow: none !important;
font-size: 17px;
font-weight: normal;
}
.chili_network_list_widget .list-group-item .card {
border: none !important;
}
.chili_network_list_widget .list-group-item:not(:last-child) .card-title .text-secondary:after {
content: ', ';
margin-right: 0.2em;
}
.chili_logo_footer {
max-height: 200px;
}
.boite.ariane .breadcrumb {
background-color: var(--front-transparent-background);
}
.boite.ariane .breadcrumb,
.boite.ariane .breadcrumb li:not(:last-child) {
padding-left: 0;
}
.boite > .card-header {
background-color: var(--front-transparent-background);
padding-left: 0;
padding-right: 0;
}
\ No newline at end of file
......@@ -29,13 +29,27 @@ class Chili_Library_Settings extends Intonation_Library_Settings {
$custom_css_classes = array_merge($custom_css_classes,
['chili_widget',
'chili_footer_widget',
'chili_banner',
'chili_logo',
'chili_logo_footer',
'chili_fixid_top',
'chili_network_list_widget',
'fond_gris',
'fond_bleu',
'fond_rouge',
'fond_blanc',
'py_4rem',
'mx_4rem',
'ml-3',
'mr-3']);
'mr-3',
'mt-5',
'order-lg-2',
'order-lg-1',
'order-1',
'order-2',
'my-3',
'py-3',
'px-3']);
$settings[$this->_template->withNameSpace('custom_css_class')] = $custom_css_classes;
......
......@@ -187,6 +187,7 @@ class Intonation_Library_Settings extends Intonation_System_Abstract {
'input id login' => 'order-3 my-3',
'div class wrapper_zendafi_form_login_lostpass' => 'col-12 order-4',
'div class wrapper_zendafi_form_login_preregistrationlink' => 'col-12 order-5 my-3',
'div class wrapper_zendafi_form_login_register' => 'col-12 order-6 my-3',
'div class wrapper_zendafi_form_custommultifacetsdoctype' => 'order-1',
'div class wrapper_zendafi_form_custommultifacetsdomains' => 'order-2',
......
......@@ -215,7 +215,7 @@ class Intonation_Library_Widget_Nav_View extends Zendafi_View_Helper_Accueil_Bas
'aria-expanded' => 'false']);
if ($instance->isWidget())
return Class_Template::current()->renderWidget($instance, $this->view);
return Class_Template::current()->renderWidget($instance->beInMenu(), $this->view);
return $this->view->tagAnchor($instance->getLink(),
$label,
......
......@@ -91,6 +91,10 @@ col-form-label-sm,
margin: 0;
}
.rech_simple.widget form {
border: 2px solid var(--special-ui-background) !important;
}
.rech_simple.widget input,
.rech_simple.widget select,
.rech_simple.widget button {
......@@ -157,14 +161,20 @@ footer .nav-link {
text-align: left;
}
.widget.login #login,
.widget.login .dropdown-toggle,
.widget.login .dropdown-toggle:after {
font-size: 20px;
margin-right: 0;
color: var(--dropdown-text);
background: var(--dropdown-background);
color: var(--dropdown-text) !important;
background: var(--dropdown-background) !important;
}
.widget.login #login {
text-align: center;
}
.widget.login .dropdown-toggle {
padding-right: 1em;
}
......@@ -179,21 +189,10 @@ header .card-body {
padding: 0;
}
.widget.login #login {
position: absolute;
bottom: 4em;
left: 0.875em;
}
.widget.login a {
font-weight: bold;
}
.widget.login a[href*="/auth/lostpass"] {
display: block;
margin-top: 4em;
}
.widget.login form {
max-width: 200px;
}
......
......@@ -455,7 +455,7 @@ class Polygone_Library_ProfilePatcher extends Intonation_Library_ProfilePatcher
->_addWidget(Intonation_Library_Widget_Carousel_Library_Definition::CODE,
Class_Profil::DIV_FOOTER,
['titre' => $this->_('Accès'),
'boite' => ['no_border', 'no_border_radius', 'no_shadow'],
'boite' => ['no_border', 'no_border_radius', 'no_shadow', 'limit_badges_5'],
'rendering' => 'card-description',
'layout' => 'horizontal_list',
'osm_map' => 0,
......
......@@ -45,6 +45,8 @@ class Polygone_Library_Settings extends Intonation_Library_Settings {
$hydrating_mapping['div class navbar-collapse'] = '';
$hydrating_mapping['div id site_web_wrapper'] = 'container';
$hydrating_mapping['div id site_web_content_wrapper'] = 'row no-gutters';
$hydrating_mapping['input id login'] = 'order-3 my-3 px-0 w-100';
$settings[$this->_template->withNameSpace('hydrating_mapping')] = $hydrating_mapping;
return $settings;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment