Commit a9d3eab5 authored by FloBen's avatar FloBen
Browse files

Merge branch 'master' into notragoraCommon

parents da61ea1c 4043c794

Too many changes to show.

To preserve performance only 1000 of 1000+ files are displayed.
......@@ -90,15 +90,6 @@ class CostumModule extends CWebModule {
$this->id.'.messages.*'
));
// var_dump("HERERE"); exit;
// var_dump(Yii::app()->session["costum"]); exit;
// $this->setImport(array(
// 'costum.models.ctenat.*',
// ));
/*$this->components = array(
'class'=>'CPhpMessageSource',
'basePath'=>'/messages'
);*/
}
public function beforeControllerAction($controller, $action)
......
......@@ -30,11 +30,10 @@ costum.init = function(where){
}
if(typeof costum.typeObj != "undefined")
costum.initTypeObj(costum.typeObj);
if(typeof costum != "undefined" && typeof costum.searchObject != "undefined" && typeof costum.searchObject.indexStep != "undefined")
/*if(typeof costum != "undefined" && typeof costum.searchObject != "undefined" && typeof costum.searchObject.indexStep != "undefined")
searchObject.indexStep=costum.searchObject.indexStep;
if(typeof costum != "undefined" && typeof costum.searchObject != "undefined" && typeof costum.searchObject.sortBy != "undefined")
searchObject.sortBy=costum.searchObject.sortBy;
searchObject.sortBy=costum.searchObject.sortBy;*/
// mylog.log("directoryViewMode 1", directoryViewMode);
// if(typeof costum.htmlConstruct != "undefined"
// && typeof costum.htmlConstruct.directory != "undefined"
......@@ -94,15 +93,40 @@ costum.getStyleCustom=function(cssObject){
if(jsonHelper.notNull(cssObject+".color"))
cssAdd+="color:"+costum.value(costum,cssObject+".color")+" !important;";
if(jsonHelper.notNull(cssObject+".paddingTop"))
cssAdd+="padding-top:"+costum.value(costum,cssObject+".paddingTop")+" !important;";
cssAdd+="padding-top:"+costum.value(costum,cssObject+".paddingTop")+"px !important;";
if(jsonHelper.notNull(cssObject+".paddingRight"))
cssAdd+="padding-right:"+costum.value(costum,cssObject+".paddingRight")+"px !important;";
if(jsonHelper.notNull(cssObject+".paddingLeft"))
cssAdd+="padding-left:"+costum.value(costum,cssObject+".paddingLeft")+" !important;";
cssAdd+="padding-left:"+costum.value(costum,cssObject+".paddingLeft")+"px !important;";
if(jsonHelper.notNull(cssObject+".paddingBottom"))
cssAdd+="padding-bottom:"+costum.value(costum,cssObject+".paddingBottom")+" !important;";
if(jsonHelper.notNull(cssObject+".height"))
cssAdd+="height:"+costum.value(costum,cssObject+".height")+"px !important;";
if(jsonHelper.notNull(cssObject+".width"))
cssAdd+="width:"+costum.value(costum,cssObject+".width")+"px !important;";
cssAdd+="padding-bottom:"+costum.value(costum,cssObject+".paddingBottom")+"px !important;";
if(jsonHelper.notNull(cssObject+".marginTop"))
cssAdd+="margin-top:"+costum.value(costum,cssObject+".marginTop")+"px !important;";
if(jsonHelper.notNull(cssObject+".marginBottom"))
cssAdd+="margin-bottom:"+costum.value(costum,cssObject+".marginBottom")+"px !important;";
if(jsonHelper.notNull(cssObject+".marginLeft"))
cssAdd+="margin-left:"+costum.value(costum,cssObject+".marginLeft")+"px !important;";
if(jsonHelper.notNull(cssObject+".marginRight"))
cssAdd+="margin-right:"+costum.value(costum,cssObject+".marginRight")+"px !important;";
if(jsonHelper.notNull(cssObject+".height")){
if(costum.value(costum,cssObject+".height") == "auto")
cssAdd+="height:"+costum.value(costum,cssObject+".height")+" !important;";
else if (costum.value(costum,cssObject+".height").toString().substr(-1) == "%")
cssAdd+="height:"+costum.value(costum,cssObject+".height")+" !important;";
else
cssAdd+="height:"+costum.value(costum,cssObject+".height")+"px !important;";
}
if(jsonHelper.notNull(cssObject+".width")){
if(costum.value(costum,cssObject+".width") == "auto")
cssAdd+="width:"+costum.value(costum,cssObject+".width")+" !important;";
else if (costum.value(costum,cssObject+".width").toString().substr(-1) == "%")
cssAdd+="width:"+costum.value(costum,cssObject+".width")+" !important;";
else
cssAdd+="width:"+costum.value(costum,cssObject+".width")+"px !important;";
}
if(jsonHelper.notNull(cssObject+".top"))
cssAdd+="top:"+costum.value(costum,cssObject+".top")+"px !important;";
if(jsonHelper.notNull(cssObject+".bottom"))
......@@ -124,13 +148,22 @@ costum.getStyleCustom=function(cssObject){
if(jsonHelper.notNull(cssObject+".margin"))
cssAdd+="margin:"+costum.value(costum,cssObject+".margin")+" !important;";
if(jsonHelper.notNull(cssObject+".display"))
cssAdd+="display:"+costum.value(costum,cssObject+".display")+" !important;";
cssAdd+="display:"+costum.value(costum,cssObject+".display")+"!important;";
if(jsonHelper.notNull(cssObject+".textTransform"))
cssAdd+="text-transform:"+costum.value(costum,cssObject+".textTransform")+" !important;";
if(jsonHelper.notNull(cssObject+".verticalAlign"))
cssAdd+="vertical-align:"+costum.value(costum,cssObject+".verticalAlign")+" !important;";
if(jsonHelper.notNull(cssObject+".float"))
cssAdd+="float:"+costum.value(costum,cssObject+".float")+" !important;";
if(jsonHelper.notNull(cssObject+".clipPath"))
cssAdd+="clip-path:"+costum.value(costum,cssObject+".clipPath")+" !important;";
if(jsonHelper.notNull(cssObject+".textDecoration"))
cssAdd+="text-decoration:"+costum.value(costum,cssObject+".textDecoration")+" !important;";
if(jsonHelper.notNull(cssObject+".textAlign"))
cssAdd+="text-align:"+costum.value(costum,cssObject+".textAlign")+" !important;";
if(jsonHelper.notNull(cssObject+".position"))
cssAdd+="position:"+costum.value(costum,cssObject+".position")+" !important;";
return cssAdd;
};
......@@ -145,9 +178,13 @@ costum.initCssCustom=function(){
str="<style type='text/css'>";
//alert(jsonHelper.notNull(style+".font"));
if(jsonHelper.notNull(style+".font") ){
//alert("costum.initCssCustom : "+style+".font");
str+="@font-face {font-family: 'customFont';src: url('"+assetPath+"/"+costum.css.font.url+"')}";
str+="body, h1, h2, h3, h4, h5, h6, button, input, select, textarea, a, p, span{font-family: 'customFont' !important;}";
if(exists(costum.css.font.useUploader) && costum.css.font.useUploader == true){
str+="@font-face {font-family: 'customFont';src: url('"+uploadedFont+"')}";
str+="body, h1, h2, h3, h4, h5, h6, button, input, select, textarea, a, p, span{font-family: 'customFont' !important;}";
}else{
str+="@font-face {font-family: 'customFont';src: url('"+assetPath+"/"+costum.css.font.url+"')}";
str+="body, h1, h2, h3, h4, h5, h6, button, input, select, textarea, a, p, span{font-family: 'customFont' !important;}";
}
}
if(jsonHelper.notNull(style+".fonts") ){
......@@ -173,11 +210,6 @@ costum.initCssCustom=function(){
str+="#mainNav{"+costum.getStyleCustom(".menuTop")+"}";
if(jsonHelper.notNull(style+".menuTop.header") )
str+="#headerBand{"+costum.getStyleCustom(".menuTop.header")+"}";
if(jsonHelper.notNull(style+".menuTop.app") ){
str+="#mainNav .menu-app-top{"+costum.getStyleCustom(".menuTop.app")+"}";
if(jsonHelper.notNull(style+".menuTop.app.button") )
str+="#mainNav .menu-app-top .menu-button{"+costum.getStyleCustom(".menuTop.app.button")+"}";
}
if(jsonHelper.notNull(style+".menuTop.logo") )
str+="#mainNav .logo-menutop{"+costum.getStyleCustom(".menuTop.logo")+"}";
if(jsonHelper.notNull(style+".menuTop.button") )
......@@ -189,6 +221,41 @@ costum.initCssCustom=function(){
if(jsonHelper.notNull(style+".menuTop.scopeBtn.hover") )
str+=".menu-btn-scope-filter:hover, .menu-btn-scope-filter.active{"+costum.getStyleCustom(".menuTop.scopeBtn.hover")+"}";
}
if(jsonHelper.notNull(style+".menuTop.app") ){
str+="#mainNav .menu-app-top{"+costum.getStyleCustom(".menuTop.app")+"}";
if(jsonHelper.notNull(style+".menuTop.app.button") )
str+="#mainNav .lbh-menu-app{"+costum.getStyleCustom(".menuTop.app.button")+"}";
if(jsonHelper.notNull(style+".menuTop.app.button.design") )
str+= "@media (min-width: 767px){"+
"#mainNav .lbh-menu-app{"+costum.getStyleCustom(".menuTop.app.button.design")+"}"+
"}";
if(jsonHelper.notNull(style+".menuTop.app.button.design.hover") )
str+= "@media (min-width: 767px){"+
"#mainNav .lbh-menu-app:hover{"+costum.getStyleCustom(".menuTop.app.button.design.hover")+"}"+
"#mainNav .lbh-menu-app:focus{"+costum.getStyleCustom(".menuTop.app.button.design.hover")+"}"+
"}";
}
if(jsonHelper.notNull(style+".menuTop.xsMenu") ){
str+="#mainNav .menu-xs-container{"+costum.getStyleCustom(".menuTop.xsMenu")+"}";
if(jsonHelper.notNull(style+".menuTop.xsMenu.button") )
str+="#mainNav .menu-xs-container a{"+costum.getStyleCustom(".menuTop.xsMenu.button")+"}";
if(jsonHelper.notNull(style+".menuTop.xsMenu.background") )
str+="#mainNav .menu-xs-container {"+costum.getStyleCustom(".menuTop.xsMenu.background")+"}";
if(jsonHelper.notNull(style+".menuTop.xsMenu.button.design") )
str+= "#mainNav .menu-xs-container a{"+costum.getStyleCustom(".menuTop.xsMenu.button.design")+"}";
if(jsonHelper.notNull(style+".menuTop.xsMenu.button.design.hover") ){
str+= "#mainNav .menu-xs-container a:hover{"+costum.getStyleCustom(".menuTop.xsMenu.button.design.hover")+"}"+
"#mainNav .menu-xs-container a:focus{"+costum.getStyleCustom(".menuTop.xsMenu.button.design.hover")+"}";
}
}
if(jsonHelper.notNull(style+".menuTop.filterBtn")){
str+=".btn-show-filters{"+costum.getStyleCustom(".menuTop.filterBtn")+"}";
if(jsonHelper.notNull(style+".menuTop.filterBtn.hover"))
......@@ -196,13 +263,27 @@ costum.initCssCustom=function(){
}
if(jsonHelper.notNull(style+".menuTop.connectBtn"))
str+="#mainNav .btn-menu-connect{"+costum.getStyleCustom(".menuTop.connectBtn")+"}";
if(jsonHelper.notNull(style+".menuTop.userProfil") )
str+= "#mainNav a.menu-name-profil{"+costum.getStyleCustom(".menuTop.userProfil")+"}";
}
if(jsonHelper.notNull(style+".menuApp") ){
str+="#menuApp{"+costum.getStyleCustom(".menuApp")+"}";
if(jsonHelper.notNull(style+".menuApp.button") )
str+="#menuApp .btn-menu-to-app{"+costum.getStyleCustom(".menuApp.button")+"}";
if(jsonHelper.notNull(style+".menuApp.button.hover") )
str+="#menuApp .btn-menu-to-app:hover, #menuApp .btn-menu-to-app:active, #menuApp .btn-menu-to-app:focus, #menuApp .btn-menu-to-app.active{"+costum.getStyleCustom(".menuApp.button.hover")+"}";
if(jsonHelper.notNull(style+".menuLeft") ){
str+="#menuLeft{"+costum.getStyleCustom(".menuLeft")+"}";
if(jsonHelper.notNull(style+".menuLeft.button") )
str+="#menuLeft .menu-button.btn-menu{"+costum.getStyleCustom(".menuLeft.button")+"}";
if(jsonHelper.notNull(style+".menuLeft.button.hover") )
str+="#menuLeft .menu-button.btn-menu:hover, #menuLeft .menu-button.btn-menu:active, #menuLeft .menu-button.btn-menu:focus, #menuLeft .menu-button.btn-menu.active{"+costum.getStyleCustom(".menuLeft.button.hover")+"}";
if(jsonHelper.notNull(style+".menuLeft.app.button.design") )
str+= "@media (min-width: 767px){"+
"#menuLeft .menu-button.btn-menu{"+costum.getStyleCustom(".menuLeft.app.button.design")+"}"+
"}";
if(jsonHelper.notNull(style+".menuLeft.app.button.design.hover") )
str+= "@media (min-width: 767px){"+
"#menuLeft .menu-button.btn-menu:hover{"+costum.getStyleCustom(".menuLeft.app.button.design.hover")+"}"+
"#menuLeft .menu-button.btn-menu:focus{"+costum.getStyleCustom(".menuLeft.app.button.design.hover")+"}"+
"}";
if(jsonHelper.notNull(style+".menuLeft.userProfil") )
str+= "#menuLeft a.menu-name-profil{"+costum.getStyleCustom(".menuLeft.userProfil")+"}";
}
if(jsonHelper.notNull(style+".progress") ){
if(jsonHelper.notNull(style+".progress.bar") )
......@@ -251,6 +332,13 @@ costum.initCssCustom=function(){
str+="</style>";
$("head").append(str);
$("#menuLeft .menu-name-profil").removeClass("pull-right");
$("#menuLeft .image-menu ").removeClass("pull-left");
if(jsonHelper.notNull("costum.htmlConstruct.header.menuTop.left") && costum.htmlConstruct.header.menuTop.left == false)
$("#mainNav").removeClass("padding-top-5 padding-bottom-5");
if(jsonHelper.notNull("costum.htmlConstruct.header.menuTop.left.addClass") && costum.htmlConstruct.header.menuTop.left.addClass.indexOf("visible-xs") != -1){
$("#mainNav").removeClass("padding-top-5 padding-bottom-5");
}
};
costum.value = function(obj,path){
......
.label-menu, .nameMenu, .btn-menu-connect {
font-family: "Helvetica Neue", Helvetica, Arial, sans-serif !important;
}
#menuTopLeft img {
background: transparent !important;
}
.nameMenu{
display: block;
font-size: 11px;
font-weight: bolder !important;
text-transform: uppercase;
text-decoration: none !important;
}
.menu-btn-top{
text-align: center;
margin-left: 4px;
margin-right: 4px;
}
#menuTopLeft .lbh-menu-app .fa, #menuTopRight .lbh-menu-app .fa, .circle, .menu-btn-top .fa{
padding: 0.5em;
border: 2px solid #2C3E50;
border-radius: 40px;
}
#menu-thumb-profil {
box-shadow: 0px 0px 5px 5px #cccccc;
}
.dropdown-menu-top a.menu-button{
background:transparent;
padding: 0px !important;
}
.dropdown-menu-top a.menu-button i{
padding-top: 12px !important;
}
.menu-name-profil, a.btn-menu-connect{
margin-left: 40px;
color: #777777;
font-weight: bolder;
background: #cce310 !important;
}
#mainNav .btn-menu-connect{
height: auto;
padding-bottom: 0px;
}
#mainNav .btn-menu-connect .fa{
border:none;
}
#menuTopLeft .searchBarInMenu #second-search-bar-addon, #menuTopRight .searchBarInMenu #second-search-bar-addon{
margin: 0px;
}
@media (max-width: 767.98px) {
.lbh-menu-app .fa, .lbh-menu-app .fa, .circle, .menu-btn-top .fa{
padding: 0.5em;
border: 2px solid #2C3E50;
border-radius: 40px;
font-size: 10pt !important;
}
}
#menuLeft {
/*left: 28px; ca depend du largeur de l'ecran*/
color: #2C3E50;
box-shadow: none;
border: none;
}
#mapOpal #menuRightmapOpal {
position: absolute !important;
}
#menuLeft #show-bottom-add {
width: 100%;
height: 47px;
}
.show-map {
padding-right: 12px;
padding-left: 12px;
}
#mapOpal {
display: none;
height: 400px;
}
#menuLeft a {
background-color: #ddd;
}
#menuLeft > a:first-child{
border-radius: 50% 50% 0px 0px;
}
#menuLeft > a:last-child{
border-radius: 0px 0px 50% 50%;
}
a.btn-menu-to-app {
border-bottom: 2px solid #a7adb3;
}
a.btn-menu-to-app.active, a.btn-menu-to-app:hover, a.btn-menu-to-app:focus{
border-bottom: 2px solid #9fbd38;
color: #9fbd38!important;
}
#mainNav #menuTopRight{
margin-top: 15px;
}
.menu-xs-container a {
border-top: 5px solid white;
border-bottom: 5px solid white;
border-left: 10px solid #9fbd38;
background-color: white;
color: #9fbd38;
}
.menu-xs-container a:hover {
border-left: 13px solid white;
background-color:#9fbd38;
color: white !important;
}
.btn-menu-connect{
background-color: #9fbd38!important;
padding: 4px;
padding-top: 4px!important;
border: 2px solid #9fbd38;
border-radius: 4px;
color: #fff;
}
.btn-menu-connect:hover, .btn-menu-connect:active, .btn-menu-connect:focus{
color: #9fbd38!important;
border: 2px solid #9fbd38;
background-color: #fff!important;
box-shadow: 0 0 6px 0 #9fbd38 inset;
}
.container-filters-menu .searchBar-filters .input-group-addon {
background-color: #9fbd38!important;
}
#filters-nav #input-sec-search .input-global-search {
border-color: #9fbd38!important;
}
#filters-nav .container-filters-menu #input-sec-search .input-group-addon {
color: #9fbd38;
border: 1px solid #9fbd38;
border-right-width: 0px;
}
.filterContainer .dropdown .btn-menu, #filters-nav .dropdown .btn-menu, #filters-nav .filters-btn {
border: 1px solid #9fbd38!important;
}
.searchBar-filters .main-search-bar-addon, .searchBar-filters .main-search-bar {
border: 1px solid #9fbd38!important;
}
@media (max-width: 767px){
.showHide {
color: #9fbd38;
}
.showHide:hover, .showHide:active, .showHide:focus{
background-color: #9fbd38;
color: #fff;
}
.container-filters-menu .searchBar-filters {
display: none!important;
}
#filterContainer .dropdown .dropdown-menu, #filters-nav .container-filters-menu .dropdown .dropdown-menu {
border: 1px solid #9fbd38!important;
}
.searchBarInMenu #main-search-bar-addon{
background-color: #9fbd38!important;
}
#filters-nav .container-filters-menu {
border-top: 2px solid #9fbd38;
}
#vertical #mainNav {
padding-left: 10px;
}
#mainNav #menuTopRight {
margin-top: 5px!important;
}
}
@media (min-width: 768px){
#mainNav #menuTopRight{
margin-top: 5px;
}
}
@media (max-width: 767px){
#mainNav #menuTopLeft a img{
height: 40px;
width: 40px;
margin-left: -10px;
}
}
#avance > p > img{
width:4vw;
}
#Projet > p {
position: absolute;
}
.schema {
position: absolute;
margin-left: -13.7vw;
margin-top: -1vw;
font-family: 'CoveredByYourGrace' !important;
font-size:47px;
}
.numVal{
font-size: 30px
}
.borderInv{
border-bottom: 1px dashed white;
}
@media all and (max-width: 980px){
#AssoLibre{
margin-left:8vw;
}
.cbyg {
font-size: 36px !important;
}
.schema {
font-size:25px;
}
}
.title-project {
position: absolute;
margin-top: -6vw;
font-size: 5vw;
font-family: 'CoveredByYourGrace' !important;
left: 0;
}
.title-asso {
color: #9ec72d;
position: absolute;
margin-top: -5vw;
font-family: 'CoveredByYourGrace' !important;
font-size: 5vw;
left: 0;
}
.plus-m {
width: 5vw;
}
\ No newline at end of file
File mode changed from 100644 to 100755
li.dropdown.open a{
display : block;
}
/*.dropdown {
display: inline;
margin-left: 1vw;
}*/
/*#filterContainer .dropdown .btn-menu, #filters-nav .dropdown .btn-menu {
padding: 10px 15px;
font-size: 16px;
border: 1px solid #38bbbc;
color:#38bbbc;
top: 0px;
position: relative;
border-radius: 20px;
text-decoration: none;
background:white;
line-height: 20px;
}
#costum-scope-search .dropdown-result-global-search {
position: absolute;
top: 60px;
z-index: 1;
background-color: white;
border: 1px solid #38bbbc;
max-height: none !important;
border-radius: 3px;
}
#filters-nav #input-sec-search .input-group {
display: inline-flex;
}
#filters-nav #input-sec-search .input-group-addon {
padding: 10px 0px 10px 10px;
font-size: 18px;
font-weight: 400;
line-height: 1;
color: #38bbbc;
margin-top: 5px;
text-align: center;
background-color:white !important;
border: 1px solid #38bbbc;
border-radius: 20px 0px 0px 20px !important;
border-right-width: 0px;
width: 30px;
}
#filters-nav #input-sec-search .input-global-search {
border-left-width: 0px;
color: #38bbbc;
height: 40px;
margin-top: 5px;
border-radius: 0px 20px 20px 0px;
box-shadow: none;
width: inherit;
border-color: #38bbbc;
}
#input-sec-search {
padding: 0px;
}
.input-group {
position: relative;
display: table;
border-collapse: separate;
}
#filters-nav #input-sec-search {
display: grid;
margin-bottom: 5px;
margin-right: 10px;
float: left;
margin-top: -0.6%;
margin-left: 1%;
}
#filterContainer .dropdown .dropdown-menu, #filters-nav .dropdown .dropdown-menu{
position: absolute;
overflow-y: visible !important;
top: 50px;
left: 5px;
width: 250px;
border-radius: 2px;