lib/CMSAdminContentController.php migrate/ContentTableMigrate.php resources/app/controller/admin/AdminContentController.php view/CMSAdminContentController/_form.html view/CMSAdminContentController/_list.html view/CMSAdminContentController/_section_filter.html @@ -10,9 +10,6 @@ echo "Be careful what you agree to!"."\n"; echo "------------------------------------------------------------------------"."\n"; system('mkdir -p '.CONTROLLER_DIR.'admin/'); system("cp -iR ".PLUGIN_DIR."cms/resources/app/controller/admin/Admin* ".CONTROLLER_DIR."admin/"); -//system("cp -R ".PLUGIN_DIR."cms/resources/public/images/cms ".PUBLIC_DIR."images/"); -//system("cp ".PLUGIN_DIR."cms/resources/public/stylesheets/*.css ".PUBLIC_DIR."stylesheets/"); -//system("cp -R ".PLUGIN_DIR."cms/resources/public/javascripts/* ".PUBLIC_DIR."javascripts/"); system("chmod -Rf 0777 ".PUBLIC_DIR); echo "All of the files have now been installed. To complete the installation:"."\n"; installer @@ -5,8 +5,8 @@ class SectionTableMigrate extends WXMigrate { public function up() { $this->create_column("title", "string"); $this->create_column("parent_id", "integer"); + $this->create_column("cms_section", "introduction", "text"); $this->create_column("order", "integer", "2", false, "0"); - $this->create_column("section_type", "integer", "2", false, "0"); $this->create_column("url", "string"); $this->create_table("cms_section"); } migrate/SectionTableMigrate.php @@ -7,7 +7,6 @@ define("CMS_VERSION", "0.1.5"); CMSApplication::register_module("home", array("display_name"=>"Admin Home", "link"=>"/admin/home/")); CMSApplication::register_module("sections", array("display_name"=>"Site Sections", "link"=>"/admin/sections/")); CMSApplication::register_module("categories", array("display_name"=>"Categories", "link"=>"/admin/categories/")); -CMSApplication::register_module("pages", array("display_name"=>"Site Pages", "link"=>"/admin/pages/")); -CMSApplication::register_module("articles", array("display_name"=>"Articles", "link"=>"/admin/articles/")); +CMSApplication::register_module("content", array("display_name"=>"Content", "link"=>"/admin/content/")); CMSApplication::register_module("files", array("display_name"=>"Files", "link"=>"/admin/files/")); ?> \ No newline at end of file setup.php @@ -1,7 +1,7 @@ <?php class TestCMSAdminController extends WebTestCase { - public $base = "http://bluebookr.intranet.webxpress/"; + public $base =false; public function setUp() { $this->user = new CmsUser; tests/TestCMSAdminController.php @@ -1,7 +1,7 @@ <?php class TestCMSAdminFileController extends WebTestCase { - public $base = "http://bluebookr.intranet.webxpress/"; + public $base = false; public $test_image; public function setUp() { tests/TestCMSAdminFileController.php @@ -2,7 +2,6 @@ <?=form_heading("Setting up a site section")?> <?=medium(text_field($model, "title"))?> <?=small(select($model, "parent_id", $tree_collection, array(), "Parent Category"))?> - <?=small(select($model, "section_type", $model->type_options))?> <?=form_divider()?> <?=medium(text_area($model, "introduction"))?> <?=form_divider()?> view/CMSAdminSectionController/_form.html lib/CMSAdminArticleController.php lib/CMSAdminPageController.php migrate/ArticleTableMigrate.php migrate/PageTableMigrate.php migrate/SectionTableAlteration.php resources/app/controller/admin/AdminArticlesController.php resources/app/controller/admin/AdminPagesController.php resources/public/images/cms/1-README resources/public/images/cms/button_delete.gif resources/public/images/cms/button_edit.gif resources/public/images/cms/button_view.gif resources/public/images/cms/cms-content-bg.jpg resources/public/images/cms/cms-footer-bg.gif resources/public/images/cms/cms-generic-icon.png resources/public/images/cms/cms-heading-bg.jpg resources/public/images/cms/cms-heading-gradient.jpg resources/public/images/cms/cms-icon-new.gif resources/public/images/cms/cms-logo-white.gif resources/public/images/cms/cms-navigation-left-tab.gif resources/public/images/cms/cms-navigation-right-tab.gif resources/public/images/cms/cms-stat-graph.gif resources/public/images/cms/cms-sub-bg.jpg resources/public/images/cms/cms_header-bg.gif resources/public/images/cms/cms_header-icon-home.gif resources/public/images/cms/cms_header-icon-logout.gif resources/public/images/cms/cms_header-icon-site.gif resources/public/images/cms/cms_header-icon-support.gif resources/public/images/cms/cms_header-submenu-bg.gif resources/public/images/cms/cms_webxpress-logo.gif resources/public/images/cms/icon_page.gif resources/public/images/cms/image-browse-bg.gif resources/public/images/cms/image-browse-tab.gif resources/public/images/cms/image-drop-zone.gif resources/public/images/cms/indicator.gif resources/public/images/cms/trash.gif resources/public/images/cms/widgeditor_button_bold.gif resources/public/images/cms/widgeditor_button_cat.gif resources/public/images/cms/widgeditor_button_empty.gif resources/public/images/cms/widgeditor_button_html.gif resources/public/images/cms/widgeditor_button_image.gif resources/public/images/cms/widgeditor_button_italic.gif resources/public/images/cms/widgeditor_button_link.gif resources/public/images/cms/widgeditor_button_ordered.gif resources/public/images/cms/widgeditor_button_shadow.gif resources/public/images/cms/widgeditor_button_unordered.gif resources/public/images/cms/widgeditor_toolbar_bg.gif resources/public/images/cms/window_close.gif resources/public/javascripts/editors/simple/css/widget-content.css resources/public/javascripts/editors/simple/images/widgeditor_button_bold.gif resources/public/javascripts/editors/simple/images/widgeditor_button_empty.gif resources/public/javascripts/editors/simple/images/widgeditor_button_html.gif resources/public/javascripts/editors/simple/images/widgeditor_button_image.gif resources/public/javascripts/editors/simple/images/widgeditor_button_italic.gif resources/public/javascripts/editors/simple/images/widgeditor_button_link.gif resources/public/javascripts/editors/simple/images/widgeditor_button_ordered.gif resources/public/javascripts/editors/simple/images/widgeditor_button_shadow.gif resources/public/javascripts/editors/simple/images/widgeditor_button_unordered.gif resources/public/javascripts/editors/simple/images/widgeditor_toolbar_bg.gif resources/public/javascripts/editors/simple/widgEditor.js resources/public/javascripts/reflection.js resources/public/stylesheets/cms-stylesheet.css resources/public/stylesheets/cms-wysiwyg-styles.css resources/public/stylesheets/form-layout.css resources/public/tests.php view/CMSAdminArticleController/_form.html view/CMSAdminArticleController/_list.html view/CMSAdminArticleController/_section_filter.html view/CMSAdminPageController/_form.html view/CMSAdminPageController/_list.html view/CMSAdminPageController/_section_filter.html f74bbc059f06451b0f713865c467d94954c96883 ross ross@0e7ba554-dfdc-446b-ac9a-b820edd20ad7 http://github.com/phpwax/wildfire/commit/18a4a06a8bb166cd320a2121556df9ee58e086c6 18a4a06a8bb166cd320a2121556df9ee58e086c6 2007-04-12T03:38:28-07:00 2007-04-12T03:38:28-07:00 merged articles and pages into single content controller git-svn-id: svn://php-wax.com/svn/plugins/cms/trunk@2712 0e7ba554-dfdc-446b-ac9a-b820edd20ad7 bc6cee2f00420d7ec65c264dc4aa3f65bf2e1cb2 ross ross@0e7ba554-dfdc-446b-ac9a-b820edd20ad7