From 91da5af668a15b89212c5cae2a4b6845bd17983b Mon Sep 17 00:00:00 2001
From: Ahmad Asjad <ahmadcimage@gmail.com>
Date: Tue, 14 Sep 2021 23:25:42 +0530
Subject: [PATCH] setTheme implementation
---
NetworkModule.php | 5 ++++-
components/CommunecterController.php | 5 +++--
controllers/DefaultController.php | 5 +++--
controllers/SurveyControllerTODELETE.php | 7 ++++---
4 files changed, 14 insertions(+), 8 deletions(-)
diff --git a/NetworkModule.php b/NetworkModule.php
index 2d63dc788..ecf6bc4e5 100755
--- a/NetworkModule.php
+++ b/NetworkModule.php
@@ -1,4 +1,7 @@
<?php
+
+use PixelHumain\PixelHumain\components\ThemeHelper;
+
/**
* Communect Module
*
@@ -23,7 +26,7 @@ class NetworkModule extends \yii\base\Module {
Yii::app()->homeUrl = Yii::app()->createUrl($this->id);
//sudo ln -s co2 network
- Yii::app()->theme = "network";
+ ThemeHelper::setWebsiteTheme( ThemeHelper::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"];
diff --git a/components/CommunecterController.php b/components/CommunecterController.php
index f4589ec69..32743e93b 100755
--- a/components/CommunecterController.php
+++ b/components/CommunecterController.php
@@ -1,5 +1,6 @@
<?php
+use PixelHumain\PixelHumain\components\ThemeHelper;
use PixelHumain\PixelHumain\modules\citizenToolKit\models\Application;
/**
@@ -628,11 +629,11 @@ class CommunecterController extends Controller
Yii::app()->params["version"] = Yii::app()->params["versionAssets"] ? Yii::app()->params["versionAssets"] : $this->version;
if( @$_GET["theme"] ){
- Yii::app()->theme = $_GET["theme"];
+ ThemeHelper::setWebsiteTheme($_GET["theme"]);
Yii::app()->session["theme"] = $_GET["theme"];
}
else if(@Yii::app()->session["theme"])
- Yii::app()->theme = Yii::app()->session["theme"];
+ ThemeHelper::setWebsiteTheme(Yii::app()->session["theme"]);
/*if( in_array(Yii::app()->controller->id,$this->$modules) ){
$this->redirect(Yii::app()->createUrl( "/".Yii::app()->controller->id."/".Yii::app()->controller->action->id ));
diff --git a/controllers/DefaultController.php b/controllers/DefaultController.php
index 7fb02cdd2..e9a3bfc3d 100755
--- a/controllers/DefaultController.php
+++ b/controllers/DefaultController.php
@@ -6,6 +6,7 @@ use CommunecterController;
use Event;
use Organization;
use PHDB;
+use PixelHumain\PixelHumain\components\ThemeHelper;
use Project;
use Yii;
@@ -45,14 +46,14 @@ class DefaultController extends CommunecterController {
$this->redirect(Yii::app()->createUrl("/network/default/index?src=".$_GET["network"]));
}
if( @$src ){
- Yii::app()->theme = "network";
+ ThemeHelper::setWebsiteTheme(ThemeHelper::NETWORK);
Yii::app()->params['networkParams'] = $src;
Yii::app()->session["theme"] = "network";
Yii::app()->session["networkParams"] = $src;
return $this->render("index");
}
else if(@Yii::app()->session["theme"] == "network" ){
- Yii::app()->theme = "network";
+ ThemeHelper::setWebsiteTheme(ThemeHelper::NETWORK);
Yii::app()->params['networkParams'] = Yii::app()->session["networkParams"];
return $this->render("index");
}else{
diff --git a/controllers/SurveyControllerTODELETE.php b/controllers/SurveyControllerTODELETE.php
index d893e8f34..31dc76dfe 100755
--- a/controllers/SurveyControllerTODELETE.php
+++ b/controllers/SurveyControllerTODELETE.php
@@ -2,6 +2,7 @@
namespace PixelHumain\PixelHumain\modules\co2\controllers;
use CommunecterController;
+use PixelHumain\PixelHumain\components\ThemeHelper;
use Yii;
/**
@@ -43,17 +44,17 @@ class SurveyController extends CommunecterController {
public function actionTextarea()
{
- Yii::app()->theme = "empty";
+ ThemeHelper::setWebsiteTheme(ThemeHelper::EMPTY);
return $this->render( "textarea" );
}
public function actionEditList()
{
- Yii::app()->theme = "empty";
+ ThemeHelper::setWebsiteTheme( ThemeHelper::EMPTY);
return $this->render( "editList" );
}
public function actionMultiAdd()
{
- Yii::app()->theme = "empty";
+ ThemeHelper::setWebsiteTheme(ThemeHelper::EMPTY);
return $this->render( "multiadd" );
}
}
\ No newline at end of file
--
GitLab