misc/spindle.profile.js public/js-src/paste/main.js public/js-src/spindle/main.js public/js-src/spindle/themes/spindle/spindle.css @@ -1,5 +1,4 @@ <? -$content = $this->render('_layout.phtml'); if (Zend_Controller_Front::getInstance()->getRequest()->getParam('nojs', false)) { $this->dojo()->disable(); $content = preg_replace('#href="([^"]*)"#s', 'href="$1?nojs=true"', $content); @@ -16,6 +15,10 @@ if (Zend_Controller_Front::getInstance()->getRequest()->getParam('nojs', false)) <?= $this->headScript() ?> </head> <body class="tundra"> - <?= $content ?> -</body> + <? $this->borderContainer()->captureStart('layout', array('design' => 'headline')) ?> + <?= $this->render('_headline.phtml') ?> + <?= $this->render('_mainPane.phtml') ?> + <?= $this->render('_navPane.phtml') ?> + <?= $this->render('_footer.phtml') ?> + <?= $this->borderContainer()->captureEnd('layout') ?></body> </html> application/layouts/scripts/layout.phtml @@ -36,7 +36,9 @@ class Spindle_PasteController extends Zend_Controller_Action $this->view->headTitle()->prepend('Pastebin'); $this->view->dojo()->setDjConfigOption('preventBackButtonFix', false) - ->addLayer('/js/paste/layer.js'); + ->registerModulePath('../paste', 'paste') + ->addStylesheetModule('paste.styles') + ->requireModule('paste.main'); } /** application/modules/spindle/controllers/PasteController.php @@ -1,7 +1,7 @@ <ul id="paste-nav"> <? if (!isset($this->message)): ?> - <li><a href="<?= $this->baseUrl() . '/paste/followup/id/' . $this->id ?>">Followup</a></li> + <li><a href="<?= $this->baseUrl() . '/spindle/paste/followup/id/' . $this->id ?>">Followup</a></li> <? endif ?> - <li><a href="<?= $this->baseUrl() . '/paste/new' ?>">New Paste</a></li> - <li><a href="<?= $this->baseUrl() . '/paste' ?>">About</a></li> + <li><a href="<?= $this->baseUrl() . '/spindle/paste/new' ?>">New Paste</a></li> + <li><a href="<?= $this->baseUrl() . '/spindle/paste' ?>">About</a></li> </ul> application/modules/spindle/views/scripts/paste/_nav.phtml @@ -22,6 +22,6 @@ - <a href="<?= $this->baseUrl() ?>/paste/new">Create a new paste.</a> + <a href="<?= $this->baseUrl() ?>/spindle/paste/new">Create a new paste.</a> application/modules/spindle/views/scripts/paste/content/about.phtml @@ -8,7 +8,7 @@ <? if ('text' != $paste['type']): ?> (<a id="format-toggle" href="#" onClick="paste.unformattedShow();">unformatted</a>) <? endif ?> - [<a href="<?= $this->baseUrl() ?>/paste/display/id/<?= $paste['id'] ?>">Permalink</a>] + [<a href="<?= $this->baseUrl() ?>/spindle/paste/display/id/<?= $paste['id'] ?>">Permalink</a>] </h3> <div id="pastecode" class="highlight"> <pre><code class="<?= $paste['type'] ?>"><?= $this->escape($paste['code']) ?></code></pre> @@ -24,14 +24,14 @@ <? if (!empty($paste['parent'])): ?> - <a href="<?= $this->baseUrl() ?>/paste/display/id/<?= $paste['parent'] ?>">Parent paste (<?= $paste['parent'] ?>)</a> + <a href="<?= $this->baseUrl() ?>/spindle/paste/display/id/<?= $paste['parent'] ?>">Parent paste (<?= $paste['parent'] ?>)</a> <? endif ?> <? if (!empty($paste['children'])): ?> Child pastes: <ul class="children"> <? foreach ($paste['children'] as $child): ?> - <li><a href="<?= $this->baseUrl() ?>/paste/display/id/<?= $child ?>"><?= $child ?></a></li> + <li><a href="<?= $this->baseUrl() ?>/spindle/paste/display/id/<?= $child ?>"><?= $child ?></a></li> <? endforeach ?> </ul> <? endif ?> application/modules/spindle/views/scripts/paste/content/display.phtml @@ -16,7 +16,7 @@ $followup = array_intersect_key($paste, $followupKeys); $followup['parent'] = $this->id; $form = $this->model->getForm(); -$form->setAction($this->baseUrl() . '/paste/save-followup/id/' . $this->id) +$form->setAction($this->baseUrl() . '/spindle/paste/save-followup/id/' . $this->id) ->setMethod('post') ->setName('followupform') ->setElementsBelongTo('followupform') application/modules/spindle/views/scripts/paste/content/followup.phtml @@ -1,5 +1,5 @@ <? $form = $this->model->getForm(); -$form->setAction($this->baseUrl() . '/paste/save') +$form->setAction($this->baseUrl() . '/spindle/paste/save') ->setMethod('post'); echo $form; application/modules/spindle/views/scripts/paste/content/new-paste.phtml @@ -169,8 +169,9 @@ class My_Plugin_Initialize extends Zend_Controller_Plugin_Abstract $view->headMeta()->appendHttpEquiv('Content-Type', 'text/html; charset=utf-8'); $view->dojo()->setDjConfigOption('isDebug', $this->config->view->dojo->isDebug) ->setLocalPath('/js/dojo/dojo.js') - ->registerModulePath('../paste', 'paste') - ->addStylesheetModule('paste.styles') + ->registerModulePath('../spindle', 'spindle') + ->addStylesheetModule('spindle.themes.spindle') + ->requireModule('spindle.main') ->disable(); Zend_Registry::set('view', $view); library/My/Plugin/Initialize.php @@ -1,11 +1,11 @@ Miscellaneous support files -- paste.profile.js - This is a build profile for the pastebin application. +- spindle.profile.js + This is a build profile for the spindle application. - To create a custom build, first copy the public/js-src/paste directory to your - Dojo source build. Then, place the paste.profile.js file in the - util/buildscripts/profiles/ directory of your Dojo source distribution. From - the util/buildscripts directory, execute the line provided in the header of - the profile to create a custom build. You can then use this custom build in - place of the shipped JS source. + To create a custom build, first copy the public/js-src/spindle and + public/js-src/paste directories to your Dojo source build. Then, place the + spindle.profile.js file in the util/buildscripts/profiles/ directory of your + Dojo source distribution. From the util/buildscripts directory, execute the + line provided in the header of the profile to create a custom build. You can + then use this custom build in place of the shipped JS source. misc/README.txt @@ -1,6 +1,6 @@ dojo.provide("paste.TabHandler"); -dojo.require("paste.layer"); +dojo.require("paste.main"); dojo.require("dijit.layout.ContentPane"); dojo.declare("paste.TabHandler", null, { public/js-src/paste/TabHandler.js @@ -1,25 +1,8 @@ -@import "../../dijit/themes/tundra/tundra.css"; @import "../../dojox/grid/resources/Grid.css"; @import "../../dojox/grid/resources/tundraGrid.css"; @import "highlight/highlight.css"; @import "highlight/autumn.css"; -body, html { - width: 100%; - height: 100%; - margin: 0; - padding: 0; -} - -#layout { - width: 100%; - height: 100%; -} - -#navPane { - width: 200px; -} - #pasteform .paste-tab, #pastebin { margin-left: 1em; margin-top: 1em; @@ -72,44 +55,6 @@ form textarea.summaryTextarea { width: 80%; } -#headline { - height: 2.5em; - background-color: #CCCCCC; -} - -#headline h1 { - font-height: 1.2em; - margin: 0; - padding: 0 0 0 0.5em; -} - -#headline a { - text-decoration: none; - color: black; -} - -#headline a:hover { - text-decoration: underline; -} - -#navPane { - width: 225px; - margin-left: 1em; - margin-top: 1em; - padding-left: 1em; -} - -#footer { - visibility: collapse; - height: 1.5em; - background-color: #CCCCCC; -} - -#footer p { - margin: 0; - padding: 0 0 0 0.5em; -} - div#pastecode { padding: 1em; border: 1px solid black; @@ -118,12 +63,3 @@ div#pastecode { background-color: #FFFFF1; } -dl.error { - background-color: #FFA4A4; - border: 1px solid #FF0000; - padding: 0.5em; -} - -dl.error dt { - font-weight: bold; -} public/js-src/paste/styles/styles.css application/layouts/scripts/_layout.phtml misc/paste.profile.js public/js-src/paste/layer.js ed2d5c0f00cd2c4aad44dbabc10df7bcb25fa3fc Matthew Weier O'Phinney matthew@weierophinney.net http://github.com/weierophinney/pastebin/commit/3668b83d2000d9d73167ef2f68fd6393d8a11440 3668b83d2000d9d73167ef2f68fd6393d8a11440

2008-12-02T20:37:11-08:00

Added spindle layer Renamed paste.layer to paste.main for consistency Refactored initialization to use spindle as base dojo provider Fixed all links Created spindle build profile 0966a44eaf0a2c15c9d12f890c50fd0a83bc7782 Matthew Weier O'Phinney matthew@weierophinney.net