Commit 2da71638 authored by Raph El's avatar Raph El
Browse files

Merge branch 'development' into map2.0

parents 46af6d08 e63e2a17

Too many changes to show.

To preserve performance only 1000 of 1000+ files are displayed.
File mode changed from 100755 to 100644
VERSION 3.2 - FÉVRIER 2018
Costum module & its documentation & clean up custom to costum
Migration of all projects in costum module and cleaning CO2
Refactor links.js (API AJAX function) and full fix on button in directory of links
Lot of fix on mobile view
Repair stats viewer on week different & sum up all connexion to give an approximative visite on website
Sourcing of users registered and invite from a costum interface => give a administration interface of admins costum
Manage directly the community of the context costum in admin interface (migrating work on cte on common tool in coomunecter toolkit)
VERSION 3.1 - YELLOW SUBMARINE - NOVEMBRE 2018 - https://github.com/pixelhumain/co2/releases/tag/3.1
Navigation facilitée
......
File mode changed from 100755 to 100644
......@@ -16,8 +16,8 @@ class Co2Module extends CWebModule {
private $_keywords = "societal, reseau,opensource,CO,communecter";
private $_description = "réseau social libre et citoyen";
private $_pageTitle = "Communecter:libre et connecté";
private $_image= "Communecter:libre et connecté";
private $_favicon= "ico.ico";
private $_image = null;
private $_favicon = null;
public function getVersion(){return $this->_version;}
public function getVersionDate(){return $this->_versionDate;}
......@@ -66,6 +66,7 @@ class Co2Module extends CWebModule {
$this->setImport(array(
'citizenToolKit.models.*',
'eco.models.*',
'costum.models.*',
'places.models.*',
'chat.models.*',
'interop.models.*',
......
......@@ -8,19 +8,6 @@
*/
class CustomModule extends CWebModule {
private $_keywords = "societal, reseau,opensource,CO,communecter";
private $_description = "réseau social libre et citoyen";
private $_pageTitle = "Communecter:libre et connecté";
private $_image= "Communecter:libre et connecté";
private $_favicon= "ico.ico";
public function getVersion(){return $this->_version;}
public function getVersionDate(){return $this->_versionDate;}
public function getKeywords(){return $this->_keywords;}
public function getDescription(){return $this->_description;}
public function getPageTitle(){return $this->_pageTitle;}
public function getImage(){return $this->_image;}
public function getFavicon(){return $this->_favicon;}
public function init()
{
......@@ -32,21 +19,18 @@ class CustomModule extends CWebModule {
'errorAction'=>'/'.$this->id.'/error'
)
));
$actual_link = (isset($_SERVER['HTTPS']) && $_SERVER['HTTPS'] === 'on' ? "https" : "http") . "://$_SERVER[HTTP_HOST]";
if(isset($_GET["el"]) && !empty($_GET["el"])){
$slug=explode(".", $_GET["el"])[1];
header('Location: '.Yii::app()->createUrl("/costum/co/index/id/".$slug));
exit;
}
Yii::app()->homeUrl = Yii::app()->createUrl($this->id);
//sudo ln -s co2 network
Yii::app()->theme = "CO2";
Yii::app()->session["theme"] == "CO2";
Yii::app()->params['costumParams'] = ( @Yii::app()->session["costumParams"] ) ? Yii::app()->session["costumParams"] : @$_GET["costum"];
/*if(@$_GET["network"] ){
Yii::app()->theme = "network";
Yii::app()->params['customParams'] = $_GET["network"];
Yii::app()->session["theme"] = "network";
Yii::app()->session["customParams"] = $_GET["network"];
} */
if(@Yii::app()->request->cookies['lang'] && !empty(Yii::app()->request->cookies['lang']->value))
Yii::app()->language = (string)Yii::app()->request->cookies['lang'];
......@@ -125,7 +109,7 @@ class CustomModule extends CWebModule {
if(@$_GET["tpl"] == "iframesig"){ $theme = $_GET["tpl"]; }
if(@$_GET["costum"]) {
if(@$_GET["custom"]) {
$theme = "CO2";
//Yii::app()->params['customParams'] = $_GET["network"];
}
......
File mode changed from 100755 to 100644
......@@ -48,6 +48,7 @@ class NetworkModule extends CWebModule {
//'ressources.models.*',
//'classifieds.models.*'
'eco.models.*',
'costum.models.*',
'places.models.*',
'chat.models.*',
'interop.models.*',
......
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
/* GLOBAL */
*{
box-sizing: border-box;
}
body,html{
min-height: 100vh;
}
/*#horizontal,
.logo-menutop{
display: none;
}*/
#bg-homepage{
width: 100%;
}
a:hover, a:focus{
text-decoration: none !important;
}
/* FONTS */
@font-face{
font-family: "cmb";
src: url("../font/laRaffinerie/cardenioModernBold.woff") format("woff"),
url("../font/laRaffinerie/cardenioModernBold.woff2") format("woff2"),
url("../font/laRaffinerie/cardenioModernBold.ttf") format("ttf")
}
body, p, a, span, button{
font-size: 16px;
font-family: "customFont" !important;
}
h1, h2, h3, h4{
font-family: "customFont" !important;
}
h3{
margin-top: 0;
margin-bottom: 25px;
font-size: 21px;
}
/* BUTTONS */
.customBtn{
}
.customBtnLine{
Xbackground-color: #fff;
display: inline-block;
}
.customBtnFull{
display: block;
padding: 3px 8px;
border-radius: 10px;
color: #fff !important;
max-width: 125px;
text-align: center;
}
.customBtnTrigger{
color: #fff;
border: none;
padding: 3px 8px;
border-radius: 5px;
}
.customBlock{
padding: 30px 20px;
margin-bottom: 50px;
background-color: #fff;
}
.main-container{
padding-top: 80px;
min-height: auto;
}
.project{
position: relative;
Xborder: 2px solid red;
height: calc(100vh - 80px);
}
.projectWrapper,
.projectMask{
position: absolute;
top: 0;
left: 210px;
height: calc(100vh - 60px);
width: calc(100vw - 210px);
overflow: auto;
padding: 50px;
z-index: 100;
max-width: 1200px;
background-color: #eeecee;
}
.projectMask{
z-index: 200;
background-color: rgba(255,255,255, 1);
}
.projectMaskContent{
display: table;
height: 100%;
width: 100%;
}
.projectMaskCell{
display: table-cell;
height: 100%;
width: 100%;
vertical-align: middle;
text-align: center;
}
.projectNav{
position: absolute;
top: 0;
left: 0;
height: calc(100vh - 60px);
overflow: auto;
padding: 0;
background-color: #FFF;
width: 210px;
box-shadow: 1px 0px 10px rgba(0,4,0,0.3);
}
.projectNav ul{
padding: 0;
}
.projectNavTriggerMobile{
display: none;
}
.projectNavContent{
height: calc(100vh - 80px);
padding-top: 15px;
}
.projectNavContent li{
list-style: none;
padding-left: 15px;
}
.projectNavContent a{
position: relative;
display: inline-block;
padding: 5px 10px 5px 0px;
text-decoration: none !important;
line-height: 17px;
margin-bottom: 5px;
}
.projectNavContent a::after{
content: '';
position: absolute;
left: 0;
bottom: 0;
height: 4px;
width: 36px;
background-color: transparent;
}
.projectNavContent a.active{
border-color: rgba(239,42,0, 1);
}
.projectNavContent a:not(.active):hover{
Xborder-right: 4px solid rgba(0,0,0, 0.15);
}
.projectNavFirstLvl > li > a{
font-weight: bold;
text-transform: uppercase;
}
.projectNavSecondLvl li{
Xpadding-left: 27px;
}
.projectNavThirdLvl{
display: none;
}
.projectNavThirdLvl li{
padding-left: 40px;
}
.toggleProjects{
font-size: 8px;
vertical-align: 2px;
opacity: 0.4;
margin-left: -5px;
cursor: pointer;
padding: 5px;
}
.toggleProjects:hover{
opacity: 1;
}
.toggleAllProjects{
margin-left: 16px;
margin-bottom: 15px;
padding: 3px 6px 2px 6px;
border: none;
border-radius: 7px;
font-size: 11px;
text-transform: uppercase;
color: #fff;
background-color: #aaa;
opacity: 0.5;
}
.toggleAllProjects:hover{
opacity: 1;
background-color: #a7a7a7;
}
.projectHeader{
position: relative;
margin-bottom: 0;
}
.projectAdmin{
position: absolute;
top: 0;
right: 0;
height: 30px;
width: 30px;
padding: 5px;
text-align: center;
background-color: rgba(0,0,0,.7);
}
.projectAdmin i{
width: 100%;
vertical-align: 1px;
color: #fff;
}
.projectBanner{
min-height: 160px;
background-position: center;
background-size: cover;
}
.projectThumb{
position: absolute;
bottom: 34px;
left: 26px;
width: 140px;
height: 140px;
border: 1px solid rgba(255,255,255, 0.8);
background-size: cover;
background-position: center;
box-shadow: 1px 0px 10px rgba(0,4,0,0.3);
}
.projectShortDescription{
position: absolute;
bottom: 36px;
left: 0;
text-align: left;
width: 100%;
line-height: 20px;
color: #FCFCFC;
padding: 10px;
padding-left: 190px;
background-color: rgba(0,0,0,0.75);
text-transform: uppercase;
}
.projectHeaderOptions{
background-color: #fff;
padding-top: 10px;
padding-bottom: 8px;
padding-left: 170px;
}
.projectHeaderOptions .row{
margin: 0;
}
.projectHeaderOptions .customBtnLine{
display: inline-block;
text-align: center;
color: #888;
border-right: 1px solid #ddd;
border-left: 1px solid #ddd;
padding-left: 10px;
padding-right: 10px;
}
.projectHeaderOptions .customBtnLine:hover,
.projectHeaderOptions .customBtnLine.active{
color: #555;
border-color: #aaa;
}
.projectHeaderOptions .col-sm-3{
text-transform: uppercase;
font-size: 14px;
}
.projectHeaderOptions span{
display: inline-block;
text-align: center;
border-radius: 50%;
background-color: #fff;
color: #01809b;
font-size: 13px;
width: 19px;
font-size: 13px;
margin-right: 3px;
vertical-align: 1px;
}
.projectHeaderOptionsCont1{
padding-left: 0;
padding-right: 0;
}
.projectHeaderOptionsCont1 .col{
padding-left: 6px;
padding-right: 6px;
}
.projectHeaderOptionsCont1 .col a{
margin: 0 auto;
max-width: 100px;
}
.projectHeaderOptionsCont2{
padding-left: 0;
padding-right: 0;
}
.projectHeaderOptionsCont2 .col{
padding-left: 7px;
padding-right: 7px;
padding-top: 3px;
}
#projectDescription{
text-align: left;
}
#projectDescription .customBtnTrigger{
display: inherit;
margin: 30px auto 0 auto;
}
#projectDescription #descriptionAbout{
max-height: 148px;
overflow: hidden;
font-family: "cmb" !important;
}
#projectChildren .col{
padding-left: 60px;
padding-right: 60px;
}
#projectChildren a{
display: block;
position: relative;
padding-bottom: 100%;
text-transform: uppercase;
background-size: cover;
background-position: center;
color: #fff;
border-radius: 50%;
}
#projectChildren a span{
display: table;
position: absolute;
top: 0;
left: 0;
width: 100%;
height: 100%;
font-size: 25px;
text-align: center;
border-radius: 50%;
background-color: rgba(0,0,0, 0.5);
border: 4px solid transparent;
Xpadding: 15px;
}
#projectChildren a span:hover{
color: rgba(0,0,0,0.2);
background-color: rgba(0,0,0,0);
}
#projectChildren a span h4{
display: table-cell;
height: 100%;
width: 100%;
vertical-align: middle;
}
#projectChildren h3{
margin-bottom: 45px;
}
.projectInfos{
padding: 0;
margin-top: 60px;
}
.projectInfosHeader .nav-tabs{
margin: 0;
}
.projectInfosHeader .nav-tab{
padding: 0;
margin-bottom: 0 !important;
border: none !important;
}
.projectInfosHeader .nav-tab a{
display: block;
text-align: center;
padding: 10px;
background-color: transparent !important;
border: none !important;
margin: 0 !important;
font-size: 18px;
}
.projectInfosHeader .nav-tab:not(.active) a:hover{
color: #fff !important;
border-radius: 0;
}
.projectInfosHeader .nav-tab.active a{
color: #fff !important;
border-radius: 0;
}
.projectInfosHeader .nav-tab.active:first-of-type a{
border-radius: 4px 0 0 0;
}
.projectInfosHeader .nav-tab.active:last-of-type a{
border-radius: 0 4px 0 0;
}
.projectInfosContent{
padding: 20px;
}
.customTab{
position: relative;
display: none;
margin-top: 2px;
}
.closeCustomTab{
display: block;
position: absolute;
top: 10px;
right: 10px;
padding: 4px 10px;
margin: 30px auto 0 auto;
text-align: center;
background: none;
color: #888;
border: 1px solid #888;
}
.closeCustomTab:hover{
background-color: #888;
color: #FFF;
}
/* ARTICLE */
article{
max-width: 750px;
padding: 40px ;
margin: 0 auto;
text-align: justify;
}
article p,
article li{
font-size: 20px;
}
article img{
width: 100%;
height: auto;
margin: 40px 0;
}
@media screen and (max-width: 992px){
.project{
height: calc( 100vh - 50px );
}
.projectNav{
left: -100%;
top: 0;
width: 100%;
height: calc(100vh - 50px);
z-index: 1000;
}
.projectWrapper,
.projectMask{
left: 0;
width: 100%;
padding: 20px;
height: calc( 100%);
}
.projectwrapper{
z-index: 900;
}
#mainNav{
height: 50px;
}
#mainNav .logo-menutop{
margin-left: 50px;
width: 40px;
height: auto;
}
.projectNavTriggerMobile{
display: block;
position: fixed;
top: 5px;
left: 5px;
height: 40px;
width: 40px;
z-index: 9999999;
text-align:center;
}
.projectNavTriggerMobile i{
color: #222;
font-size: 32px;
vertical-align: -16px;
}
.projectBanner,
.projectShortDescription{
display: none !important;
}
.projectThumb{
position: relative;
top: 0;
left: 0;
width: 100%;
}
.projectHeaderOptions{
padding-left: 0;
padding-bottom: 0;
text-align: center;
}
.projectHeaderOptions .row{
margin: 0;
}
.projectHeaderOptionsCont1{
padding-bottom: 15px;
padding-top: 5px;
}
.projectHeaderOptionsCont1 .col{
padding-left: 10px;
padding-right: 10px;
}
.projectHeaderOptionsCont2 {
padding: 0;
}
.projectHeaderOptionsCont2 .col{
padding: 0;
}
.projectHeaderOptionsCont2 .customBtnLine{