Merge branch 'dev' of git://github.com/infinitas/infinitas into dev

infinitas · Jan 5, 2010 · 455ced0 · 455ced0
2 parents bad99e7 + 90c41c1
commit 455ced0
Show file tree

Hide file tree

Showing 509 changed files with 186 additions and 2,658 deletions.
diff --git a/app_helper.php b/app_helper.php
@@ -207,11 +207,18 @@ function ordering( $id = null, $order = null )
             {
                 $this->errors[] = 'The order was not passed';
             }
-            $out  = $order.' ';
+
+            $out  = $this->Html->link( $order, array( '#' => $order ) );
 
             $out .= $this->Html->link(
                 $this->Html->image(
-                    'core/icons/actions/16/arrow-up-yes.png'
+                    $this->Image->getRelativePath( 'actions', 'arrow-up' ),
+                    array(
+                        'alt'   => __( 'Up', true ),
+                        'title' => __( 'Move up', true ),
+                        'width' => '16px',
+                        'class' => 'arrow-up'
+                    )
                 ),
                 array(
                     'action' => 'reorder',
@@ -221,14 +228,18 @@ function ordering( $id = null, $order = null )
                 ),
                 array(
                     'escape' => false,
-                    'title' => __( 'Move up', true ),
-                    'alt' => __( 'Up', true )
                 )
             );
 
             $out .= $this->Html->link(
                 $this->Html->image(
-                    'core/icons/actions/16/arrow-down-yes.png'
+                    $this->Image->getRelativePath( 'actions', 'arrow-down' ),
+                    array(
+                        'alt'   => __( 'Down', true ),
+                        'title' => __( 'Move down', true ),
+                        'width' => '16px',
+                        'class' => 'arrow-down'
+                    )
                 ),
                 array(
                     'action' => 'reorder',
@@ -238,8 +249,6 @@ function ordering( $id = null, $order = null )
                 ),
                 array(
                     'escape' => false,
-                    'title' => __( 'Move down', true ),
-                    'alt' => __( 'Down', true )
                 )
             );
 

diff --git a/config/bootstrap.php b/config/bootstrap.php
@@ -48,13 +48,5 @@
      * Inflector::rules('plural', array('rules' => array(), 'irregular' => array(), 'uninflected' => array()));
      *
      */
-    App::build(
-        array(
-            'plugins' => array(
-                dirname( dirname( __FILE__ ) ).DS.'core'
-            )
-        )
-    );
-
-
+    App::build( array( 'plugins' => array( dirname( dirname( __FILE__ ) ).DS.'infinitas'.DS ) ) );
 ?>
diff --git a/config/images.php b/config/images.php
@@ -19,7 +19,7 @@
             'export'      => 'zip.png',
             'favourite'   => 'favourite.png',
             'featured'    => 'featured.png',
-            'locked'      => 'locked.png',
+            '-locked'      => 'locked.png',
             'move'        => 'move.png',
             'order-asc'   => 'order-asc.png',
             'order-desc'  => 'order-desc.png',
@@ -148,6 +148,17 @@
             'yahoo'    => 'yahoo-messanger.png'
         ),
 
+        'status' => array(
+            'active'       => 'active.png',
+            'inactive'     => 'inactive.png',
+            'home'         => 'home.png',
+            'not-home'     => 'not-home.png',
+            'locked'       => 'locked.png',
+            'not-locked'   => 'not-locked.png',
+            'featured'     => 'featured.png',
+            'not-featured' => 'not-featured.png',
+        ),
+
         'unknown' => array(
             'unknown' => 'unknown.png',
             'readme'  => 'readme.png',

diff --git a/config/routes.php b/config/routes.php
@@ -45,5 +45,6 @@
      * cms routes
      */
     Router::connect('/admin/cms', array( 'plugin' => 'cms', 'controller' => 'categories', 'action' => 'dashboard', 'prefix' => 'admin', 'admin' => true ) );
+    //Router::connect('/admin/cms/:controller/:action/*', array( 'plugin' => 'cms', 'admin' => true ) );
     Router::connect('/cms',       array( 'plugin' => 'cms', 'controller' => 'contentFrontpages' ) );
 ?>
diff --git a/plugins/blog/blog_app_controller.php → infinitas/blog/blog_app_controller.php b/plugins/blog/blog_app_controller.php → infinitas/blog/blog_app_controller.php
diff --git a/plugins/blog/blog_app_model.php → infinitas/blog/blog_app_model.php b/plugins/blog/blog_app_model.php → infinitas/blog/blog_app_model.php
diff --git a/...ins/blog/controllers/posts_controller.php → ...tas/blog/controllers/posts_controller.php b/...ins/blog/controllers/posts_controller.php → ...tas/blog/controllers/posts_controller.php
diff --git a/plugins/blog/models/post.php → infinitas/blog/models/post.php b/plugins/blog/models/post.php → infinitas/blog/models/post.php
diff --git a/plugins/blog/models/tag.php → infinitas/blog/models/tag.php b/plugins/blog/models/tag.php → infinitas/blog/models/tag.php
diff --git a/plugins/blog/views/elements/actions.ctp → infinitas/blog/views/elements/actions.ctp b/plugins/blog/views/elements/actions.ctp → infinitas/blog/views/elements/actions.ctp
diff --git a/plugins/blog/views/elements/post_dates.ctp → infinitas/blog/views/elements/post_dates.ctp b/plugins/blog/views/elements/post_dates.ctp → infinitas/blog/views/elements/post_dates.ctp
diff --git a/plugins/blog/views/elements/right_boxes.ctp → ...nitas/blog/views/elements/right_boxes.ctp b/plugins/blog/views/elements/right_boxes.ctp → ...nitas/blog/views/elements/right_boxes.ctp
diff --git a/plugins/blog/views/elements/tag_cloud.ctp → infinitas/blog/views/elements/tag_cloud.ctp b/plugins/blog/views/elements/tag_cloud.ctp → infinitas/blog/views/elements/tag_cloud.ctp
diff --git a/plugins/blog/views/helpers/blog.php → infinitas/blog/views/helpers/blog.php b/plugins/blog/views/helpers/blog.php → infinitas/blog/views/helpers/blog.php
diff --git a/...ins/blog/views/helpers/comment_layout.php → ...tas/blog/views/helpers/comment_layout.php b/...ins/blog/views/helpers/comment_layout.php → ...tas/blog/views/helpers/comment_layout.php
diff --git a/plugins/blog/views/helpers/post_layout.php → infinitas/blog/views/helpers/post_layout.php b/plugins/blog/views/helpers/post_layout.php → infinitas/blog/views/helpers/post_layout.php
diff --git a/plugins/blog/views/posts/admin_add.ctp → infinitas/blog/views/posts/admin_add.ctp b/plugins/blog/views/posts/admin_add.ctp → infinitas/blog/views/posts/admin_add.ctp
diff --git a/plugins/blog/views/posts/admin_dashboard.ctp → ...itas/blog/views/posts/admin_dashboard.ctp b/plugins/blog/views/posts/admin_dashboard.ctp → ...itas/blog/views/posts/admin_dashboard.ctp
diff --git a/plugins/blog/views/posts/admin_edit.ctp → infinitas/blog/views/posts/admin_edit.ctp b/plugins/blog/views/posts/admin_edit.ctp → infinitas/blog/views/posts/admin_edit.ctp
diff --git a/plugins/blog/views/posts/admin_index.ctp → infinitas/blog/views/posts/admin_index.ctp b/plugins/blog/views/posts/admin_index.ctp → infinitas/blog/views/posts/admin_index.ctp
diff --git a/plugins/blog/views/posts/comment.ctp → infinitas/blog/views/posts/comment.ctp b/plugins/blog/views/posts/comment.ctp → infinitas/blog/views/posts/comment.ctp
diff --git a/plugins/blog/views/posts/index.ctp → infinitas/blog/views/posts/index.ctp b/plugins/blog/views/posts/index.ctp → infinitas/blog/views/posts/index.ctp
diff --git a/plugins/blog/views/posts/view.ctp → infinitas/blog/views/posts/view.ctp b/plugins/blog/views/posts/view.ctp → infinitas/blog/views/posts/view.ctp
diff --git a/plugins/cms/cms_app_controller.php → infinitas/cms/cms_app_controller.php b/plugins/cms/cms_app_controller.php → infinitas/cms/cms_app_controller.php
diff --git a/plugins/cms/cms_app_model.php → infinitas/cms/cms_app_model.php b/plugins/cms/cms_app_model.php → infinitas/cms/cms_app_model.php
diff --git a/...cms/controllers/categories_controller.php → ...cms/controllers/categories_controller.php b/...cms/controllers/categories_controller.php → ...cms/controllers/categories_controller.php
diff --git a/...rollers/content_frontpages_controller.php → ...rollers/content_frontpages_controller.php b/...rollers/content_frontpages_controller.php → ...rollers/content_frontpages_controller.php
@@ -42,6 +42,7 @@ function admin_index()
 
             $this->paginate = array(
                 'fields' => array(
+                    'ContentFrontpage.id',
                     'ContentFrontpage.content_id',
                     'ContentFrontpage.ordering',
                     'ContentFrontpage.created',

diff --git a/...s/cms/controllers/contents_controller.php → ...s/cms/controllers/contents_controller.php b/...s/cms/controllers/contents_controller.php → ...s/cms/controllers/contents_controller.php
@@ -46,6 +46,8 @@ function view( $id = null )
             $this->set( 'content', $this->Content->read( null, $id ) );
         }
 
+
+
         function admin_index()
         {
             $this->paginate = array(

diff --git a/...s/cms/controllers/features_controller.php → ...s/cms/controllers/features_controller.php b/...s/cms/controllers/features_controller.php → ...s/cms/controllers/features_controller.php
@@ -27,10 +27,10 @@ function admin_index()
 
             $this->paginate = array(
                 'fields' => array(
+                    'Feature.id',
                     'Feature.content_id',
                     'Feature.ordering',
-                    'Feature.created',
-                    'Feature.modified'
+                    'Feature.created'
                 ),
                 'contain' => array(
                     'Content' => array(

diff --git a/infinitas/cms/models/category.php b/infinitas/cms/models/category.php
@@ -0,0 +1,62 @@
+<?php
+    /**
+     * Comment Template.
+     *
+     * @todo Implement .this needs to be sorted out.
+     *
+     * Copyright (c) 2009 Carl Sutton ( dogmatic69 )
+     *
+     * Licensed under The MIT License
+     * Redistributions of files must retain the above copyright notice.
+     * @filesource
+     * @copyright Copyright (c) 2009 Carl Sutton ( dogmatic69 )
+     * @link http://www.dogmatic.co.za
+     * @package sort
+     * @subpackage sort.comments
+     * @license http://www.opensource.org/licenses/mit-license.php The MIT License
+     * @since 0.5a
+     */
+
+    class Category extends CmsAppModel
+    {
+        var $name = 'Category';
+
+        var $actsAs = array(
+            'Core.Sluggable',
+            'Core.Viewable',
+            'Tree'
+        );
+
+        var $order = array(
+            'Category.lft' => 'ASC'
+        );
+
+        var $validate = array(
+            'title' => array(
+                'notempty' => array( 'rule' => array( 'notempty' ) ),
+                ),
+            );
+
+        var $belongsTo = array(
+            'Parent' => array(
+                'className' => 'Cms.Category',
+                'counterCache' => true
+            ),
+            'Core.Group',
+            'Locker' => array(
+                'className'  => 'Core.User',
+                'foreignKey' => 'locked_by',
+                'conditions' => '',
+                'fields' => array(
+                    'Locker.id',
+                    'Locker.username'
+                ),
+                'order' => ''
+            )
+        );
+
+        var $hasMany = array(
+            'Cms.Content'
+        );
+    }
+?>
diff --git a/plugins/cms/models/content.php → infinitas/cms/models/content.php b/plugins/cms/models/content.php → infinitas/cms/models/content.php
@@ -35,23 +35,30 @@ class Content extends CmsAppModel
 
         var $actsAs = array(
             'Core.Sluggable',
-            'Core.Viewable',
-            'Core.Ordered' => array(
-                'foreign_key' => 'category_id'
-            )
+            'Core.Viewable'
         );
 
     	var $belongsTo = array(
             'Category' => array(
                 'className' => 'Cms.Category',
                 'counterCache' => true
             ),
-            'Core.Group'
+            'Core.Group',
+            'Locker' => array(
+            	'className' => 'Core.User',
+            	'foreignKey' => 'locked_by',
+            	'conditions' => '',
+            	'fields' => array(
+                    'Locker.id',
+                    'Locker.username'
+                ),
+            	'order' => ''
+            )
     	);
 
     	var $hasMany = array(
-    		'Cms.ContentFrontpage'
+    		'Cms.ContentFrontpage',
+    		'Cms.Feature',
     	);
-
     }
 ?>
diff --git a/plugins/cms/models/content_frontpage.php → infinitas/cms/models/content_frontpage.php b/plugins/cms/models/content_frontpage.php → infinitas/cms/models/content_frontpage.php
@@ -21,8 +21,6 @@
     class ContentFrontpage extends CmsAppModel
     {
     	var $name = 'ContentFrontpage';
-    	var $primaryKey = 'content_id';
-    	var $displayField = 'content_id';
 
         var $actsAs = array(
             'Core.Ordered'

diff --git a/plugins/cms/models/feature.php → infinitas/cms/models/feature.php b/plugins/cms/models/feature.php → infinitas/cms/models/feature.php
@@ -21,15 +21,15 @@
     class Feature extends CmsAppModel
     {
         var $name         = 'Feature';
-        var $primaryKey   = 'content_id';
-        var $displayField = 'content_id';
 
         var $order = array(
             'Feature.ordering' => 'DESC'
         );
 
         var $actsAs = array(
-            'Core.Ordered'
+            'Core.Ordered' => array(
+                'foreign_key' => 'order_id'
+            )
         );
 
         var $belongsTo = array(

diff --git a/plugins/cms/views/categories/admin_add.ctp → infinitas/cms/views/categories/admin_add.ctp b/plugins/cms/views/categories/admin_add.ctp → infinitas/cms/views/categories/admin_add.ctp
diff --git a/.../cms/views/categories/admin_dashboard.ctp → .../cms/views/categories/admin_dashboard.ctp b/.../cms/views/categories/admin_dashboard.ctp → .../cms/views/categories/admin_dashboard.ctp
diff --git a/plugins/cms/views/categories/admin_edit.ctp → ...nitas/cms/views/categories/admin_edit.ctp b/plugins/cms/views/categories/admin_edit.ctp → ...nitas/cms/views/categories/admin_edit.ctp
diff --git a/plugins/cms/views/categories/admin_index.ctp → ...itas/cms/views/categories/admin_index.ctp b/plugins/cms/views/categories/admin_index.ctp → ...itas/cms/views/categories/admin_index.ctp
@@ -89,10 +89,7 @@
                 		</td>
                 		<td>
                 			<?php
-                			    echo $this->Cms->ordering(
-                			        $category['Category']['id'],
-                			        $category['Category']['ordering']
-                			    );
+                			    // @todo -c Implement .add up and down for mptt
                 			?>
                 		</td>
                 		<td>

diff --git a/plugins/cms/views/categories/index.ctp → infinitas/cms/views/categories/index.ctp b/plugins/cms/views/categories/index.ctp → infinitas/cms/views/categories/index.ctp
diff --git a/plugins/cms/views/categories/view.ctp → infinitas/cms/views/categories/view.ctp b/plugins/cms/views/categories/view.ctp → infinitas/cms/views/categories/view.ctp
diff --git a/...ms/views/content_frontpages/admin_add.ctp → ...ms/views/content_frontpages/admin_add.ctp b/...ms/views/content_frontpages/admin_add.ctp → ...ms/views/content_frontpages/admin_add.ctp
diff --git a/.../views/content_frontpages/admin_index.ctp → .../views/content_frontpages/admin_index.ctp b/.../views/content_frontpages/admin_index.ctp → .../views/content_frontpages/admin_index.ctp
@@ -60,7 +60,7 @@
             {
                 ?>
                 	<tr class="<?php echo $this->Cms->rowClass( $i ); ?>">
-                        <td><?php echo $this->Form->checkbox( $contentFrontpage['ContentFrontpage']['content_id'] ); ?>&nbsp;</td>
+                        <td><?php echo $this->Form->checkbox( $contentFrontpage['ContentFrontpage']['id'] ); ?>&nbsp;</td>
                 		<td>
                 			<?php echo $this->Html->link( $contentFrontpage['Content']['title'], array('controller' => 'contents', 'action' => 'view', $contentFrontpage['Content']['id'])); ?>
                 		</td>

diff --git a/...ns/cms/views/content_frontpages/index.ctp → ...as/cms/views/content_frontpages/index.ctp b/...ns/cms/views/content_frontpages/index.ctp → ...as/cms/views/content_frontpages/index.ctp
diff --git a/plugins/cms/views/contents/admin_add.ctp → infinitas/cms/views/contents/admin_add.ctp b/plugins/cms/views/contents/admin_add.ctp → infinitas/cms/views/contents/admin_add.ctp
diff --git a/plugins/cms/views/contents/admin_edit.ctp → infinitas/cms/views/contents/admin_edit.ctp b/plugins/cms/views/contents/admin_edit.ctp → infinitas/cms/views/contents/admin_edit.ctp
diff --git a/plugins/cms/views/contents/admin_index.ctp → infinitas/cms/views/contents/admin_index.ctp b/plugins/cms/views/contents/admin_index.ctp → infinitas/cms/views/contents/admin_index.ctp
@@ -56,7 +56,7 @@
                         'style' => 'width:50px;'
                     ),
                     __( 'Status', true ) => array(
-                        'style' => 'width:50px;'
+                        'style' => 'width:100px;'
                     )
                 )
             );
@@ -100,17 +100,15 @@
                 		<td>
                 			<?php echo $this->Time->niceShort( $content['Content']['modified'] ); ?>
                 		</td>
-                		<td>
+                		<td class="status">
                 			<?php
-                			    echo $this->Cms->ordering(
-                			        $content['Content']['id'],
-                			        $content['Content']['ordering']
-                			    );
+                			    echo $this->Cms->ordering( $content['Content']['id'], $content['Content']['ordering'] );
                 			?>
                 		</td>
-                		<td>
+                		<td class="status">
                 			<?php
                 			    echo $this->Cms->homePageItem( $content ),
+                        			$this->Status->featured( $content ),
                 			        $this->Status->toggle( $content['Content']['active'], $content['Content']['id'] ),
                     			    $this->Status->locked( $content, 'Content' );
                 			?>

diff --git a/plugins/cms/views/contents/index.ctp → infinitas/cms/views/contents/index.ctp b/plugins/cms/views/contents/index.ctp → infinitas/cms/views/contents/index.ctp
diff --git a/plugins/cms/views/contents/view.ctp → infinitas/cms/views/contents/view.ctp b/plugins/cms/views/contents/view.ctp → infinitas/cms/views/contents/view.ctp
diff --git a/plugins/cms/views/elements/actions.ctp → infinitas/cms/views/elements/actions.ctp b/plugins/cms/views/elements/actions.ctp → infinitas/cms/views/elements/actions.ctp
diff --git a/...log/views/elements/pagination/counter.ctp → ...cms/views/elements/pagination/counter.ctp b/...log/views/elements/pagination/counter.ctp → ...cms/views/elements/pagination/counter.ctp
diff --git a/.../views/elements/pagination/navigation.ctp → .../views/elements/pagination/navigation.ctp b/.../views/elements/pagination/navigation.ctp → .../views/elements/pagination/navigation.ctp
diff --git a/plugins/cms/views/elements/right_boxes.ctp → infinitas/cms/views/elements/right_boxes.ctp b/plugins/cms/views/elements/right_boxes.ctp → infinitas/cms/views/elements/right_boxes.ctp
diff --git a/plugins/cms/views/features/admin_add.ctp → infinitas/cms/views/features/admin_add.ctp b/plugins/cms/views/features/admin_add.ctp → infinitas/cms/views/features/admin_add.ctp
diff --git a/plugins/cms/views/features/admin_index.ctp → infinitas/cms/views/features/admin_index.ctp b/plugins/cms/views/features/admin_index.ctp → infinitas/cms/views/features/admin_index.ctp
@@ -44,9 +44,6 @@
                     $this->Paginator->sort( 'created' ) => array(
                         'style' => 'width:100px;'
                     ),
-                    $this->Paginator->sort( 'modified' ) => array(
-                        'style' => 'width:100px;'
-                    ),
                     $this->Paginator->sort( 'ordering' ) => array(
                         'style' => 'width:50px;'
                     ),
@@ -61,7 +58,7 @@
             {
                 ?>
                 	<tr class="<?php echo $this->Cms->rowClass( $i ); ?>">
-                        <td><?php echo $this->Form->checkbox( $feature['Feature']['content_id'] ); ?>&nbsp;</td>
+                        <td><?php echo $this->Form->checkbox( $feature['Feature']['id'] ); ?>&nbsp;</td>
                 		<td>
                 			<?php echo $this->Html->link( $feature['Content']['title'], array('controller' => 'features', 'action' => 'view', $feature['Content']['id'])); ?>
                 		</td>
@@ -71,9 +68,6 @@
                 		<td>
                 			<?php echo $this->Time->niceShort( $feature['Feature']['created'] ); ?>
                 		</td>
-                		<td>
-                			<?php echo $this->Time->niceShort( $feature['Feature']['modified'] ); ?>
-                		</td>
                 		<td>
                 			<?php
                 			    echo $this->Cms->ordering(