Permalink
Browse files

continued

  • Loading branch information...
1 parent a3950f0 commit a41e90714918f80f106edbdd5bc22af35c94f820 @bartcc bartcc committed Mar 4, 2012
@@ -27,7 +27,7 @@
* its action called 'display', and we pass a param to select the view file
* to use (in this case, /app/views/pages/home.ctp)...
*/
-Router::connect('/', array('controller' => 'tasks_app'));
+Router::connect('/', array('controller' => 'pages', 'action' => 'display', 'home'));
Router::connectNamed(array('passed'));
Router::connect('/q/*', array('controller' => 'kodaks', 'action' => 'develop'));
Router::connect('/git/*', array('controller' => 'gits', 'action' => 'exec'));
@@ -27,8 +27,9 @@
</title>
<?php
echo $this->Html->meta('icon');
-
- echo $this->Html->css('cake.generic');
+
+ echo $this->Html->css('twitter/bootstrap/bootstrap');
+ echo $this->Html->css('app');
echo $scripts_for_layout;
?>
@@ -1,154 +0,0 @@
-<?php
-/**
- *
- * PHP versions 4 and 5
- *
- * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
- * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
- *
- * Licensed under The MIT License
- * Redistributions of files must retain the above copyright notice.
- *
- * @copyright Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
- * @link http://cakephp.org CakePHP(tm) Project
- * @package cake
- * @subpackage cake.cake.console.libs.templates.skel.views.layouts
- * @since CakePHP(tm) v 0.10.0.1076
- * @license MIT License (http://www.opensource.org/licenses/mit-license.php)
- */
-?>
-<!DOCTYPE html>
-<html xmlns="http://www.w3.org/1999/xhtml" >
- <head>
- <?php echo $this->Html->charset(); ?>
- <title>
- <?php __('CakePHP: Evaluating Spine.js:'); ?>
- <?php echo $title_for_layout; ?>
- </title>
- <?php
- echo $this->Html->meta('icon');
-
- echo $this->Html->css('themes/jquery-ui/ui-darkness/jquery-ui-1.8.16.custom');
- echo $this->Html->css('fileupload/jquery.fileupload-ui');
- echo $this->Html->css('spine/director/modal');
- echo $this->Html->css('normalize');
- echo $this->Html->css('twitter/bootstrap/1.4.0/bootstrap.min');
- echo $this->Html->css('blueimp/bootstrap-image-gallery.min');
- echo $this->Html->css('html5sortable/jquery.html5sortable');
- echo $this->Html->css('spine/director/application');
-
- echo $html->scriptStart();
- ?>
- var base_url = '<?php echo $html->url('/'); ?>';
- <?php
- echo $html->scriptEnd();
-
- echo $this->Html->script('lib/jquery/jquery-1.7.1');
- echo $this->Html->script('lib/jquery/ui/jquery-ui-1.8.16');
- echo $this->Html->script('lib/jquery/ui/jquery.ui.core');
- echo $this->Html->script('lib/jquery/ui/jquery.ui.widget.min');
- echo $this->Html->script('lib/jquery/ui/jquery.ui.mouse');
- echo $this->Html->script('lib/jquery/ui/jquery.ui.draggable');
- echo $this->Html->script('lib/jquery/ui/jquery.ui.droppable');
- echo $this->Html->script('lib/jquery/ui/jquery.ui.sortable');
- echo $this->Html->script('lib/jquery/ui/jquery.ui.progressbar');
- echo $this->Html->script('lib/jquery/ui/jquery.ui.button');
- echo $this->Html->script('lib/jquery/ui/jquery.ui.slider');
- echo $this->Html->script('lib/jquery/ui/effects/jquery.effects.core');
- echo $this->Html->script('lib/jquery/ui/effects/jquery.effects.slide');
- echo $this->Html->script('lib/jquery/jquery.tmpl');
- echo $this->Html->script('lib/jquery/jquery.html5sortable');
- echo $this->Html->script('lib/twitter/bootstrap-modal');
- echo $this->Html->script('lib/blueimp/tmpl');
- echo $this->Html->script('lib/blueimp/load-image');
- echo $this->Html->script('lib/blueimp/bootstrap-image-gallery');
- echo $this->Html->script('lib/blueimp/jquery.iframe-transport');
- echo $this->Html->script('lib/blueimp/jquery.fileupload');
- echo $this->Html->script('lib/blueimp/jquery.fileupload-ui');
-// echo $this->Html->script('http://twitter.github.com/bootstrap/1.4.0/bootstrap-modal.min.js');
-// echo $this->Html->script('lib/jquery/jquery.idealforms');
-
- #echo $this->Html->script('spine/lib/spine_0.0.9');
- echo $this->Html->script('spine/lib/spine_1.0.5');
- echo $this->Html->script('spine/lib/local');
- echo $this->Html->script('spine/lib/ajax');
- echo $this->Html->script('spine/lib/filter');
- echo $this->Html->script('spine/lib/manager');
- echo $this->Html->script('spine/lib/tmpl');
-
- echo $this->Html->script('spine/app/director/plugins/jquery-plugins');
- echo $this->Html->script('spine/app/director/plugins/manager');
- echo $this->Html->script('spine/app/director/plugins/controller');
- echo $this->Html->script('spine/app/director/plugins/drag');
- echo $this->Html->script('spine/app/director/plugins/sort');
- echo $this->Html->script('spine/app/director/plugins/model_extender');
- echo $this->Html->script('spine/app/director/plugins/ajax_relations');
- echo $this->Html->script('spine/app/director/plugins/cache');
- echo $this->Html->script('spine/app/director/plugins/uri');
- echo $this->Html->script('spine/app/director/models/galleries_album');
- echo $this->Html->script('spine/app/director/models/albums_photo');
- echo $this->Html->script('spine/app/director/models/gallery');
- echo $this->Html->script('spine/app/director/models/photo');
- echo $this->Html->script('spine/app/director/models/album');
- echo $this->Html->script('spine/app/director/models/user');
- echo $this->Html->script('spine/app/director/models/error');
- echo $this->Html->script('spine/app/director/models/recent');
- echo $this->Html->script('spine/app/director/models/toolbar');
- echo $this->Html->script('spine/app/director/controllers/toolbar_view');
- echo $this->Html->script('spine/app/director/controllers/loader');
- echo $this->Html->script('spine/app/director/controllers/info');
- echo $this->Html->script('spine/app/director/controllers/overview_view');
- echo $this->Html->script('spine/app/director/controllers/gallery_editor_view');
- echo $this->Html->script('spine/app/director/controllers/galleries_view');
- echo $this->Html->script('spine/app/director/controllers/albums_view');
- echo $this->Html->script('spine/app/director/controllers/photos_view');
- echo $this->Html->script('spine/app/director/controllers/photo_view');
- echo $this->Html->script('spine/app/director/controllers/slideshow_view');
- echo $this->Html->script('spine/app/director/controllers/galleries_header');
- echo $this->Html->script('spine/app/director/controllers/albums_header');
- echo $this->Html->script('spine/app/director/controllers/photos_header');
- echo $this->Html->script('spine/app/director/controllers/photo_header');
- echo $this->Html->script('spine/app/director/controllers/main');
- echo $this->Html->script('spine/app/director/controllers/login');
- echo $this->Html->script('spine/app/director/controllers/sidebar');
- echo $this->Html->script('spine/app/director/controllers/show');
- echo $this->Html->script('spine/app/director/controllers/sidebar_list');
- echo $this->Html->script('spine/app/director/controllers/galleries_list');
- echo $this->Html->script('spine/app/director/controllers/albums_list');
- echo $this->Html->script('spine/app/director/controllers/photos_list');
- echo $this->Html->script('spine/app/director/controllers/gallery_edit_view');
- echo $this->Html->script('spine/app/director/controllers/album_edit_view');
- echo $this->Html->script('spine/app/director/controllers/photo_edit_view');
- echo $this->Html->script('spine/app/director/controllers/upload_edit_view');
- echo $this->Html->script('spine/app/director/application');
- ?>
-
- <?php
-// $this->log('******************** galleries **********************', LOG_DEBUG);
-// $this->log($galleries, LOG_DEBUG);
-// $this->log('******************** albums **********************', LOG_DEBUG);
-// $this->log($albums, LOG_DEBUG);
- echo $html->scriptStart();
- ?>
-
- $(function() {
- var galleries = <?php echo $js->object($galleries); ?>;
- var albums = <?php echo $js->object($albums); ?>;
- var photos = <?php echo $js->object($photos); ?>;
- Photo.refresh(photos, {clear: true});
- Album.refresh(albums, {clear: true});
- Gallery.refresh(galleries, {clear: true});
- })
-
- <?php
- //$this->log($js->object($galleries), LOG_DEBUG) ;
- echo $html->scriptEnd();
-
- echo $scripts_for_layout;
- ?>
- </head>
- <body class="views">
- <?php echo $content_for_layout; ?>
- <?php echo $this->element('sql_dump'); ?>
- </body>
-</html>
@@ -30,6 +30,7 @@
//echo $this->Html->css('cake.generic');
+ echo $this->Html->css('base');
echo $this->Html->css('spine/todos/application');
echo $this->Html->script('lib/json2');
@@ -29,7 +29,8 @@
echo $this->Html->meta('icon');
//echo $this->Html->css('cake.generic');
-
+
+ echo $this->Html->css('base');
echo $this->Html->css('backbone/todos/application_boxmodel');
echo $this->Html->css('themes/jquery-ui/ui-darkness/jquery.ui.custom.css');
@@ -1,82 +1,14 @@
-<h2>Sweet, "App" got Baked by CakePHP!</h2>
-
-<?php
-if (Configure::read() > 0):
- Debugger::checkSecurityKeys();
-endif;
-?>
-<p>
-<?php
- if (is_writable(TMP)):
- echo '<span class="notice success">';
- __('Your tmp directory is writable.');
- echo '</span>';
- else:
- echo '<span class="notice">';
- __('Your tmp directory is NOT writable.');
- echo '</span>';
- endif;
-?>
-</p>
-<p>
-<?php
- $settings = Cache::settings();
- if (!empty($settings)):
- echo '<span class="notice success">';
- printf(__('The %s is being used for caching. To change the config edit APP/config/core.php ', true), '<em>'. $settings['engine'] . 'Engine</em>');
- echo '</span>';
- else:
- echo '<span class="notice">';
- __('Your cache is NOT working. Please check the settings in APP/config/core.php');
- echo '</span>';
- endif;
-?>
-</p>
-<p>
-<?php
- $filePresent = null;
- if (file_exists(CONFIGS . 'database.php')):
- echo '<span class="notice success">';
- __('Your database configuration file is present.');
- $filePresent = true;
- echo '</span>';
- else:
- echo '<span class="notice">';
- __('Your database configuration file is NOT present.');
- echo '<br/>';
- __('Rename config/database.php.default to config/database.php');
- echo '</span>';
- endif;
-?>
-</p>
-<?php
-if (!empty($filePresent)):
- if (!class_exists('ConnectionManager')) {
- require LIBS . 'model' . DS . 'connection_manager.php';
- }
- $db = ConnectionManager::getInstance();
- $connected = $db->getDataSource('default');
-?>
-<p>
-<?php
- if ($connected->isConnected()):
- echo '<span class="notice success">';
- __('Cake is able to connect to the database.');
- echo '</span>';
- else:
- echo '<span class="notice">';
- __('Cake is NOT able to connect to the database.');
- echo '</span>';
- endif;
-?>
-</p>
-<?php endif;?>
-<h3><?php __('Editing this Page') ?></h3>
-<p>
-<?php
- printf(__('To change the content of this page, edit: %s
- To change its layout, edit: %s
- You can also add some CSS styles for your pages at: %s', true),
- APP . 'views' . DS . 'pages' . DS . 'home.ctp.<br />', APP . 'views' . DS . 'layouts' . DS . 'default.ctp.<br />', APP . 'webroot' . DS . 'css');
-?>
-</p>
+<div class="container">
+ <header class="jumbotron masthead">
+ <div class="inner">
+ <h1>Todos...</h1>
+ <p>
+ Choose the Framework you want to run
+ </p>
+ <p class="download-info">
+ <a href="/todos_app" class="btn btn-primary btn-large" type="submit">Backbone's Todos</a>
+ <a href="/tasks_app" class="btn btn-large" type="submit">Spine's Todos</a>
+ </p>
+ </div>
+ </header>
+</div>
@@ -30,7 +30,7 @@
</script>
<header id="title">
- <h1>Todos</h1>
+ <h1><a href="/">Todos</a></h1>
</header>
<div id="wrapper" class="hbox flex">
@@ -1,5 +1,5 @@
<header id="title" class="hbox">
- <h1>Todos</h1>
+ <h1><a href="/">Todos</a></h1>
<div id="logout" class="flex tright" style="margin-top: 8px;"></div>
</header>
<div id="wrapper" class="hbox flex">
Oops, something went wrong.

0 comments on commit a41e907

Please sign in to comment.