started reworking of menu structure

thyseus · Mar 11, 2014 · 6383eb0 · 6383eb0
1 parent 094cddf
commit 6383eb0
Show file tree

Hide file tree

Showing 14 changed files with 288 additions and 253 deletions.
diff --git a/index.php b/index.php
@@ -21,6 +21,13 @@
         'loginType' => 7, // username, email and hybridauth
         'hybridAuthProviders' => array('Facebook', 'Twitter'),
       ),
+      'role' => array(),
+      'registration' => array(),
+      'profile' => array(),
+      'avatar' => array(),
+      'usergroup' => array(),
+      'friendship' => array(),
+      'message' => array(),
     ),
     'components'=>array(
       'cache' => array('class' => 'system.caching.CFileCache'),

diff --git a/modules/role/views/role/admin.php b/modules/role/views/role/admin.php
@@ -2,25 +2,25 @@
 $this->title = Yum::t('Manage roles'); 
 
 $this->breadcrumbs=array(
-	Yum::t('Roles')=>array('index'),
-	Yum::t('Manage'),
+  Yum::t('Roles')=>array('index'),
+  Yum::t('Manage'),
 );
 
 ?>
-
-<?php $this->widget('zii.widgets.grid.CGridView', array(
-	'dataProvider'=>$dataProvider,
-	'columns'=>array(
-		array(
-			'name' => 'title',
-			'type' => 'raw',
-			'value'=> 'CHtml::link(CHtml::encode($data->title),
-				array("//role/role/view","id"=>$data->id))',
-		),
-		'price',
-		'membership_priority',
-		array(
-			'class'=>'CButtonColumn',
-		),
-	),
+<?php
+$this->widget('zii.widgets.grid.CGridView', array(
+  'dataProvider'=>$dataProvider,
+  'columns'=>array(
+    array(
+      'name' => 'title',
+      'type' => 'raw',
+      'value'=> 'CHtml::link(CHtml::encode($data->title),
+    array("//role/role/view","id"=>$data->id))',
+  ),
+  'price',
+  'membership_priority',
+  array(
+    'class'=>'CButtonColumn',
+  ),
+),
 )); ?>
diff --git a/modules/user/assets/js/bootstrap.min.js b/modules/user/assets/js/bootstrap.min.js
diff --git a/modules/user/controllers/YumInstallController.php b/modules/user/controllers/YumInstallController.php
@@ -2,7 +2,6 @@
 
 class YumInstallController extends YumController
 {
-  public $layout = 'install';
   public $defaultAction = 'install';
 
   public function accessRules()
@@ -33,7 +32,6 @@ public function actionInstallation()
   public function actionInstall()
   {
     if ($this->module->debug === true) {
-
       if(!Yii::app()->user instanceof YumWebUser)
         throw new CHttpException(500, Yum::t('Please make sure that Yii uses the YumWebUser component instead of CWebUser in your config/main.php components section. Please see the installation instructions.'));
 
@@ -44,7 +42,7 @@ public function actionInstall()
         throw new CHttpException(500, 'Please set a table prefix, at least \'\', to your db configuration for yii-user-management to work.');
 
       if(!version_compare(Yii::getVersion(), '1.1.14', '>='))
-        throw new CHttpException(500, 'Please make sure to use at least Yii version 1.1.14.'); 
+        throw new CHttpException(500, 'Please make sure to use at least Yii version 1.1.14.');
 
       if (Yii::app()->request->isPostRequest) {
         // A associative array containing the tables to be created.