Skip to content

Commit

Permalink
Dev : template variations
Browse files Browse the repository at this point in the history
  • Loading branch information
LouisGac committed Dec 1, 2015
1 parent b64d46f commit 81f2849
Show file tree
Hide file tree
Showing 3,688 changed files with 206,676 additions and 35,375 deletions.
The diff you're trying to view is too large. We only load the first 3000 changed files.
189 changes: 187 additions & 2 deletions application/config/third_party.php
View file
Expand Up @@ -295,7 +295,7 @@
'css/lime-admin.css',
'css/fonts.css',
'css/font-awesome/font-awesome-43.min.css',
'css/awesome-bootstrap-checkbox/awesome-bootstrap-checkbox.css',

'css/statistics.css',

),
Expand All @@ -322,7 +322,34 @@
'css/lime-admin.css',
'css/fonts.css',
'css/font-awesome/font-awesome-43.min.css',
'css/awesome-bootstrap-checkbox/awesome-bootstrap-checkbox.css',

'css/statistics.css',

),
'depends' => array(
'jquery',
'jquery-notify',
'bootstrap'
),
),

// LimeSurvey Bootstrap Admin Interface
'lime-bootstrap-Bay_of_Many' => array(
'baseUrl' => 'styles/Bay_of_Many/',

'js'=>array(
'scripts/notify.js',
'scripts/save.js',
'scripts/panelclickable.js',
'scripts/panelsanimation.js',
'scripts/sidemenu.js'
),

'css' => array(
'css/lime-admin.css',
'css/fonts.css',
'css/font-awesome/font-awesome-43.min.css',

'css/statistics.css',

),
Expand All @@ -333,4 +360,162 @@
),
),

// LimeSurvey Bootstrap Admin Interface
'lime-bootstrap-Dark_Sky' => array(
'baseUrl' => 'styles/Dark_Sky/',

'js'=>array(
'scripts/notify.js',
'scripts/save.js',
'scripts/panelclickable.js',
'scripts/panelsanimation.js',
'scripts/sidemenu.js'
),

'css' => array(
'css/lime-admin.css',
'css/fonts.css',
'css/font-awesome/font-awesome-43.min.css',

'css/statistics.css',

),
'depends' => array(
'jquery',
'jquery-notify',
'bootstrap'
),
),

// LimeSurvey Bootstrap Admin Interface
'lime-bootstrap-Free_Magenta' => array(
'baseUrl' => 'styles/Free_Magenta/',

'js'=>array(
'scripts/notify.js',
'scripts/save.js',
'scripts/panelclickable.js',
'scripts/panelsanimation.js',
'scripts/sidemenu.js'
),

'css' => array(
'css/lime-admin.css',
'css/fonts.css',
'css/font-awesome/font-awesome-43.min.css',
'css/statistics.css',

),
'depends' => array(
'jquery',
'jquery-notify',
'bootstrap'
),
),

// LimeSurvey Bootstrap Admin Interface
'lime-bootstrap-Black_Pearl' => array(
'baseUrl' => 'styles/Black_Pearl/',

'js'=>array(
'scripts/notify.js',
'scripts/save.js',
'scripts/panelclickable.js',
'scripts/panelsanimation.js',
'scripts/sidemenu.js'
),

'css' => array(
'css/lime-admin.css',
'css/fonts.css',
'css/font-awesome/font-awesome-43.min.css',
'css/statistics.css',

),
'depends' => array(
'jquery',
'jquery-notify',
'bootstrap'
),
),

// LimeSurvey Bootstrap Admin Interface
'lime-bootstrap-Purple_Tentacle' => array(
'baseUrl' => 'styles/Purple_Tentacle/',

'js'=>array(
'scripts/notify.js',
'scripts/save.js',
'scripts/panelclickable.js',
'scripts/panelsanimation.js',
'scripts/sidemenu.js'
),

'css' => array(
'css/lime-admin.css',
'css/fonts.css',
'css/font-awesome/font-awesome-43.min.css',
'css/statistics.css',

),
'depends' => array(
'jquery',
'jquery-notify',
'bootstrap'
),
),

// LimeSurvey Bootstrap Admin Interface
'lime-bootstrap-Ripe_Lemon' => array(
'baseUrl' => 'styles/Ripe_Lemon/',

'js'=>array(
'scripts/notify.js',
'scripts/save.js',
'scripts/panelclickable.js',
'scripts/panelsanimation.js',
'scripts/sidemenu.js'
),

'css' => array(
'css/lime-admin.css',
'css/fonts.css',
'css/font-awesome/font-awesome-43.min.css',
'css/statistics.css',

),
'depends' => array(
'jquery',
'jquery-notify',
'bootstrap'
),
),

// LimeSurvey Bootstrap Admin Interface
'lime-bootstrap-Sunset_Orange' => array(
'baseUrl' => 'styles/Sunset_Orange/',

'js'=>array(
'scripts/notify.js',
'scripts/save.js',
'scripts/panelclickable.js',
'scripts/panelsanimation.js',
'scripts/sidemenu.js'
),

'css' => array(
'css/lime-admin.css',
'css/fonts.css',
'css/font-awesome/font-awesome-43.min.css',
'css/statistics.css',

),
'depends' => array(
'jquery',
'jquery-notify',
'bootstrap'
),
),


);
27 changes: 16 additions & 11 deletions application/models/Template.php
View file
Expand Up @@ -64,7 +64,7 @@ public static function templateNameFilter($sTemplateName)
$sDefaulttemplate=Yii::app()->getConfig('defaulttemplate','default');
$sTemplateName=empty($sTemplateName) ? $sDefaulttemplate : $sTemplateName;

/* Validate it's a real dir included in template allowed dir
/* Validate it's a real dir included in template allowed dir
* Alternative : use realpath("$dir/$sTemplateName")=="$dir/$sTemplateName" and is_dir
*/
if(array_key_exists($sTemplateName,self::getTemplateList()))
Expand Down Expand Up @@ -172,17 +172,22 @@ public static function isStandardTemplate($sTemplateName)
{
return in_array($sTemplateName,
array(
'basic',
'bluengrey',
'business_grey',
'citronade',
'clear_logo',
'default',
'eirenicon',
'limespired',
'mint_idea',
'sherpa',
'vallendar',
'blue_sky',
'metro_ode',
'electric_black',
'night_mode',
'flat_and_modern',
'news_paper',
'light_and_shadow',
'material_design',
'readable',
'sandstone',
'minimalist',
'gunmetal',
'super_blue',
'ubuntu_orange',
'yeti'
)
);
}
Expand Down
Binary file removed ...s/Apple_Blossom/css/.sass-cache/809b8612803f75987dcb81e2cb832807cfd7aee0/lime-admin.scssc
View file
Binary file not shown.

0 comments on commit 81f2849

Please sign in to comment.