Commit 908f5aed authored by Raph El's avatar Raph El
Browse files

Merge branch 'master' into qa

parents a60d5edf ceb6e652
......@@ -19,12 +19,13 @@ class NetworkModule extends CWebModule {
'errorAction'=>'/'.$this->id.'/error'
)
));
//var_dump("NETWORK INIT"); exit;
Yii::app()->homeUrl = Yii::app()->createUrl($this->id);
//sudo ln -s co2 network
Yii::app()->theme = "network";
Yii::app()->session["theme"] == "network";
Yii::app()->session["network"] = "network";
Yii::app()->params['networkParams'] = ( @Yii::app()->session["networkParams"] ) ? Yii::app()->session["networkParams"] : @$_GET["network"];
/*if(@$_GET["network"] ){
......@@ -119,6 +120,9 @@ class NetworkModule extends CWebModule {
//Yii::app()->params['networkParams'] = $_GET["network"];
}
Yii::app()->session["theme"] = $theme;
Rest::json(Yii::app()->session["theme"]); exit;
//Yii::app()->session["network"]
return $theme;
}
}
......@@ -592,6 +592,7 @@ function getLabelTitleDir(dataName, dataIcon, countData, n){
}
if(dataName != "contacts" && dataName != "collections" &&
( costum == null ||
typeof costum.htmlConstruct.element == "undefined" ||
typeof costum.htmlConstruct.element.viewMode == "undefined" ||
costum.htmlConstruct.element.viewMode == true ) ){
html+='<div class="col-xs-12 text-right no-padding margin-top-5">'+
......
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