Skip to content

Commit

Permalink
Dev: comment third party, prepared a package for displayParticpants, …
Browse files Browse the repository at this point in the history 
…added a css file for jquery package, prepared the style/bootstrap directory
  • Loading branch information
louis committed Sep 28, 2015
1 parent ee7530e commit 963ac1b
Show file tree
Hide file tree
Showing 9 changed files with 2,379 additions and 35 deletions.
89 changes: 61 additions & 28 deletions application/config/third_party.php
View file
Expand Up @@ -5,12 +5,31 @@
* Defining them here allows for easy inclusion in views.
*/
return array(

// jQuery
'jquery' => array(
'baseUrl' => 'third_party/jquery/',
'js' => array(
'jquery-1.11.1.min.js'
)
),
),

// jQuery UI
'jqueryui' => array(
'baseUrl' => 'third_party/jqueryui/',
'js' => array(
'js/jquery-ui-1.10.3.custom.min.js'
),
'css' => array(
'css/jquery-ui.css'
),
'depends' => array(
'jquery',
'bootstrap'
)
),

// jQgrid
'jqgrid' => array(
'baseUrl' => 'third_party/jqgrid/',
'js' => array(
Expand All @@ -36,6 +55,8 @@
)

),

// jQuery Notify
'jquery-notify' => array(
'baseUrl' => 'third_party/jquery-notify',
'js' => array(
Expand All @@ -49,19 +70,8 @@
)

),
'jqueryui' => array(
'baseUrl' => 'third_party/jqueryui/',
'js' => array(
'js/jquery-ui-1.10.3.custom.min.js'
),
'css' => array(
//'css/smoothness/jquery-ui-1.10.0.custom.min.css'
),
'depends' => array(
'jquery',
'bootstrap'
)
),

// jquery bindWithDelay
'jquery-bindWithDelay' => array(
'baseUrl' => 'third_party/jquery-bindWithDelay',
'js' => array(
Expand All @@ -71,6 +81,8 @@
'jquery'
)
),

// jQuery Cookie
'jquery-cookie' => array(
'baseUrl' => 'third_party/jquery-cookie',
'js' => array(
Expand All @@ -80,6 +92,8 @@
'jquery'
)
),

// jQuery Superfish
'jquery-superfish' => array(
'baseUrl' => 'third_party/jquery-superfish',
'js' => array(
Expand All @@ -94,6 +108,8 @@
)

),

// jQuery json
'jquery-json' => array(
'baseUrl' => 'third_party/jquery-json',
'js' => array(
Expand All @@ -103,6 +119,8 @@
'jquery'
)
),

// jQuery blockUI
'jquery-blockUI' => array(
'baseUrl' => 'third_party/jquery-blockui',
'js' => array(
Expand All @@ -112,6 +130,8 @@
'jquery'
)
),

// qTip2
'qTip2' => array(
'baseUrl' => 'third_party/qTip2',
'js' => array(
Expand All @@ -125,6 +145,8 @@
)

),

// jQuery Table Sorter
'jquery-tablesorter' => array(
'baseUrl' => 'third_party/jquery-tablesorter',
'js' => array(
Expand All @@ -134,6 +156,8 @@
'jquery'
)
),

// jQuery NestedSortable
'jquery-nestedSortable' => array(
'baseUrl' => 'third_party/jquery-nestedSortable',
'js' => array(
Expand All @@ -143,20 +167,8 @@
'jqueryui'
)
),
'jquery-multiselect' => array(
'baseUrl' => 'third_party/jquery-multiselect',
'js' => array(
'src/jquery.multiselect.min.js',
'src/jquery.multiselect.filter.min.js'
),
'css' => array(
'jquery.multiselect.css',
'jquery.multiselect.filter.css'
),
'depends' => array(
'jquery'
)
),

// Bootstrap Multiselect
'bootstrap-multiselect' => array(
'baseUrl' => 'third_party/bootstrap-multiselect',
'js' => array(
Expand All @@ -169,6 +181,8 @@
'jquery'
)
),

// Ace
'ace' => array(
'baseUrl' => 'third_party/ace',
'js' => array(
Expand All @@ -178,6 +192,8 @@
'jquery-ace'
)
),

// jQuery Ace
'jquery-ace' => array(
'baseUrl' => 'third_party/jquery-ace',
'js' => array(
Expand All @@ -187,6 +203,8 @@
'jquery',
)
),

// jQuery selectboxes
'jquery-selectboxes' => array(
'baseUrl' => 'third_party/jquery-selectboxes/selectboxes',
'js' => array(
Expand All @@ -196,6 +214,8 @@
'jquery'
)
),

// jQuery actual
'jquery-actual' => array(
'baseUrl' => 'third_party/jquery-actual/',
'js' => array(
Expand All @@ -205,6 +225,8 @@
'jquery'
)
),

// jQuery touch punch
'jquery-touch-punch' => array(
'baseUrl' => 'third_party/jquery-touch-punch/',
'js' => array(
Expand All @@ -215,6 +237,7 @@
)
),

// jQuery timepicker
'jqueryui-timepicker' => array(
'baseUrl' => 'third_party/jquery-ui-timepicker-addon/',
'js' => array(
Expand All @@ -228,10 +251,20 @@
)
),

// jQuery horizontal scroll
'jquery-horizontal-scroll' => array(
'baseUrl' => 'third_party/jquery.horizontal.scroll',
'js' => array(
'jquery.horizontal.scroll.js'
),
),

// displayParticipants
'display-participants' => array(
'baseUrl' => 'styles/bootstrap/',
'css' => array(
'displayParticipants.css',
),
),

);
22 changes: 15 additions & 7 deletions application/views/admin/super/header.php
View file
Expand Up @@ -4,24 +4,32 @@
<meta http-equiv="content-type" content="text/html; charset=UTF-8" />
<meta http-equiv="X-UA-Compatible" content="IE=edge" />
<?php

// jQuery plugins
App()->getClientScript()->registerPackage('jqueryui');
App()->getClientScript()->registerPackage('jquery-cookie');
App()->getClientScript()->registerPackage('qTip2');
App()->getClientScript()->registerCssFile(Yii::app()->getConfig('adminstyleurl') . "jquery-ui/jquery-ui.css" );
App()->getClientScript()->registerCssFile(Yii::app()->getConfig('publicstyleurl') . 'jquery.multiselect.css');
App()->getClientScript()->registerCssFile(Yii::app()->getConfig('publicstyleurl') . 'jquery.multiselect.filter.css');
App()->getClientScript()->registerCssFile(Yii::app()->getConfig('adminstyleurl') . "displayParticipants.css");
App()->bootstrap->register();

// App()->getClientScript()->registerCssFile( App()->getAssetManager()->publish( dirname(Yii::app()->request->scriptFile).'/styles/gringegreen/' . "adminstyle.css") );

// display participants : should rather be in the right contoller
App()->getClientScript()->registerPackage('display-participants');

// Bootstrap
App()->bootstrap->register();
App()->getClientScript()->registerCssFile(Yii::app()->getConfig('adminstyleurl') . "../bootstrap/lime-icons2.css" );
App()->getClientScript()->registerCssFile(Yii::app()->getConfig('adminstyleurl') . "font-awesome/font-awesome-43.min.css");
App()->getClientScript()->registerCssFile(Yii::app()->getConfig('adminstyleurl') . "awesome-bootstrap-checkbox/awesome-bootstrap-checkbox.css");

// Right to Left
if (getLanguageRTL($_SESSION['adminlang']))
{
App()->getClientScript()->registerCssFile(Yii::app()->getConfig('adminstyleurl') . "adminstyle-rtl.css" );
}

// Printable
App()->getClientScript()->registerCssFile(Yii::app()->getConfig('adminstyleurl') . "printablestyle.css", 'print');

App()->getClientScript()->registerCssFile(Yii::app()->getConfig('adminstyleurl') . "font-awesome/font-awesome-43.min.css");
App()->getClientScript()->registerCssFile(Yii::app()->getConfig('adminstyleurl') . "awesome-bootstrap-checkbox/awesome-bootstrap-checkbox.css");

?>
<?php echo $datepickerlang;?>
Expand Down

0 comments on commit 963ac1b

Please sign in to comment.