set modules per theme, if the module does not have a theme it will sh…

…ow in all themes
infinitas · Jan 22, 2010 · b5dff82 · b5dff82
1 parent 0388248
commit b5dff82
Show file tree

Hide file tree

Showing 6 changed files with 36 additions and 5 deletions.
diff --git a/extensions/libs/views/helpers/infinitas.php b/extensions/libs/views/helpers/infinitas.php
@@ -16,6 +16,11 @@ function loadModules($position = null){
 				$currentRoute = Router::currentRoute();
 
 				foreach($modules as $module){
+					if ($module['Theme']['name'] != '' && $module['Theme']['name'] != $this->theme) {
+						//skip modules that are not for the current theme
+						continue;
+					}
+
 					$moduleOut = '<div class="module '.$module['Module']['module'].'">';
 						if ($module['Module']['show_heading']) {
 							$moduleOut .= '<h2>'.__($module['Module']['name'],true).'</h2>';

diff --git a/infinitas/management/controllers/modules_controller.php b/infinitas/management/controllers/modules_controller.php
@@ -27,7 +27,8 @@ function admin_add() {
 			$positions = $this->Module->Position->find('list');
 			$groups = $this->Module->Group->find('list');
 			$routes = array(0 => __('All Pages', true)) + $this->Module->Route->find('list');
-			$this->set(compact('positions', 'groups', 'routes'));
+			$themes = array(0 => __('All Themes', true)) + $this->Module->Theme->find('list');
+			$this->set(compact('positions', 'groups', 'routes', 'themes'));
 		}
 
 		function admin_edit($id = null) {
@@ -52,7 +53,8 @@ function admin_edit($id = null) {
 			$positions = $this->Module->Position->find('list');
 			$groups = $this->Module->Group->find('list');
 			$routes = array(0 => __('All Pages', true)) + $this->Module->Route->find('list');
-			$this->set(compact('positions', 'groups', 'routes'));
+			$themes = array(0 => __('All Themes', true)) + $this->Module->Theme->find('list');
+			$this->set(compact('positions', 'groups', 'routes', 'themes'));
 		}
 	}
 ?>
diff --git a/infinitas/management/models/module.php b/infinitas/management/models/module.php
@@ -24,7 +24,11 @@ class Module extends ManagementAppModel{
 				'className' => 'Management.ModulePosition',
 				'foreignKey' => 'position_id'
 			),
-			'Management.Group'
+			'Management.Group',
+			'Theme' => array(
+				'className' => 'Management.Theme',
+				'foreignKey' => 'theme_id'
+			),
 		);
 
 		var $hasAndBelongsToMany = array(
@@ -75,6 +79,12 @@ function getModules($position = null){
 								'Route.name',
 								'Route.url'
 							)
+						),
+						'Theme' => array(
+							'fields' => array(
+								'Theme.id',
+								'Theme.name'
+							)
 						)
 					)
 				)

diff --git a/infinitas/management/views/modules/admin_add.ctp b/infinitas/management/views/modules/admin_add.ctp
@@ -24,6 +24,7 @@
 			<?php
 		        echo $this->Form->input( 'name' );
 		        echo $this->Form->input( 'module' );
+		        echo $this->Form->input( 'theme_id' );
 		        echo $this->Form->input( 'position_id' );
 		        echo $this->Form->input( 'group_id' );
 		        echo $this->Form->input( 'active' );

diff --git a/infinitas/management/views/modules/admin_edit.ctp b/infinitas/management/views/modules/admin_edit.ctp
@@ -25,6 +25,7 @@
 		        echo $this->Form->input( 'id' );
 		        echo $this->Form->input( 'name' );
 		        echo $this->Form->input( 'module' );
+		        echo $this->Form->input( 'theme_id' );
 		        echo $this->Form->input( 'position_id' );
 		        echo $this->Form->input( 'group_id' );
 		        echo $this->Form->input( 'active' );

diff --git a/infinitas/management/views/modules/admin_index.ctp b/infinitas/management/views/modules/admin_index.ctp
@@ -42,12 +42,13 @@
                         'style' => 'width:25px;'
                     ),
                     $this->Paginator->sort( 'name' ),
-                    $this->Paginator->sort( 'Position', 'Position.Name' ),
+                    $this->Paginator->sort( 'Theme', 'Theme.name' ),
+                    $this->Paginator->sort( 'Position', 'Position.name' ),
                     $this->Paginator->sort( 'author' ),
                     $this->Paginator->sort( 'licence' ) => array(
                         'style' => 'width:75px;'
                     ),
-                    $this->Paginator->sort( 'Group', 'Group.Name' ) => array(
+                    $this->Paginator->sort( 'Group', 'Group.name' ) => array(
                         'style' => 'width:75px;'
                     ),
                     $this->Paginator->sort( 'Locked', true ) => array(
@@ -74,6 +75,17 @@
                 		<td>
                 			<?php echo $this->Html->link( Inflector::humanize($module['Module']['name']), array('action' => 'edit', $module['Module']['id'])); ?>&nbsp;
                 		</td>
+                		<td>
+                			<?php
+	                			if (!empty($module['Theme']['name'])) {
+	                				echo $module['Theme']['name'];
+	                			}
+	                			else
+                				{
+			                		echo __('All');
+                				}
+							?>&nbsp;
+                		</td>
                 		<td>
                 			<?php echo $module['Position']['name']; ?>&nbsp;
                 		</td>