Changeset 1855

Timestamp:

07/27/2010 04:49:56 PM (6 weeks ago)

Author:

johnnyoffline

Message:

Fixed a bug where global slots in the layout were editable in Admin areas, because the edit = false flag was never introduced into the templates even after ticket #36 was declared fixed and closed. Also, moved the reset stylesheet up to the sandbox level so that it can be optional for people. Created a new scoped reset style in a-reset that will be used to scope resets to our controls exclusively. Thanks Daniel Lohse. Going to give this a try

Location:

plugins/apostrophePlugin/branches/features/css

Files:

• data/generator/sfDoctrineModule/aAdmin/template/templates/_assets.php (modified) (2 diffs)
• modules/a/templates/_footer.php (modified) (1 diff)
• modules/a/templates/layout.php (modified) (1 diff)
• modules/aUserAdmin/config/generator.yml (modified) (1 diff)
• web/css/a-reset.css (modified) (1 diff)

plugins/apostrophePlugin/branches/features/css/data/generator/sfDoctrineModule/aAdmin/template/templates/_assets.php

@@ +1 @@
+[?php use_helper('I18N','jQuery','a')?]
+
 [?php slot('body_class') ?]a-admin a-admin-generator [?php echo $sf_params->get('module'); ?] [?php echo $sf_params->get('action');?] [?php end_slot() ?]
 
@@ -4 +6 @@
 
         [?php use_stylesheet('<?php echo $this->params['css'] ?>', 'first') ?] 
-
-<?php else: ?> 
-
-        [?php use_stylesheet('/apostrophePlugin/css/a.css', 'first') ?]
-
-        [?php use_javascript('/apostrophePlugin/js/aControls.js') ?]
-        [?php use_javascript('/apostrophePlugin/js/aUI.js') ?]
-
-        [?php use_stylesheet('<?php echo sfConfig::get('sf_jquery_web_dir') ?>/css/<?php echo sfConfig::get('sf_jquery_ui_css', 'ui-apostrophe/jquery-ui-1.7.3.custom.css') ?>', 'first') # JQ Date Picker Styles (This is the custome Apostrophe styles for the JQ Date Picker) ?]
-        [?php use_javascript('<?php echo sfConfig::get('sf_jquery_web_dir') ?>/js/plugins/<?php echo sfConfig::get('sf_jquery_ui', 'jquery-ui-1.7.3.custom.min.js') ?>', 'last') # JQ Date Picker JS (This can/should be consolidated with sfJqueryReloadedPlugin/js/jquery-ui-sortable...) ?]
-        [?php use_javascript('<?php echo sfConfig::get('sf_jquery_web_dir') ?>/js/plugins/jquery.autocomplete.min.js', 'last') # Autocomplete Plugin for Time Picker JS ?]
-
+        
 <?php endif; ?>
 

plugins/apostrophePlugin/branches/features/css/modules/a/templates/_footer.php

@@ +1 @@
+<?php use_helper('a') ?>
+<?php $page = aTools::getCurrentNonAdminPage() ?>
+        
 <?php if (has_slot('a-footer')): ?>
   <?php include_slot('a-footer') ?>
 <?php else: ?>
-  <?php a_slot('footer', 'aRichText', array("global" => true)) ?>
+  <?php a_slot('footer', 'aRichText', array(
+                'global' => true,
+                'edit' => isset($page) ? true : false,
+        )) ?>
 <?php endif ?>
+
 <?php // Feel free to shut this off in app.yml or override the footer partial in your app ?>
 <?php if (sfConfig::get('app_a_credit', true)): ?>

plugins/apostrophePlugin/branches/features/css/modules/a/templates/layout.php

@@ -57 +57 @@
           <?php include_slot('a-logo') ?>
         <?php else: ?>
-          <?php a_slot("logo", 'aButton', array("global" => true, "width" => 360, "flexHeight" => true, "resizeType" => "s", "link" => "/", "defaultImage" => "/apostrophePlugin/images/cmstest-sample-logo.png")) ?>
+          <?php a_slot('logo', 'aButton', array(
+                                                'global' => true, 
+                                                'edit' => isset($page) ? true : false,                          
+                                                'width' => 360, 
+                                                'flexHeight' => true, 
+                                                'resizeType' => 's', 
+                                                'link' => '/', 
+                                                'defaultImage' => '/apostrophePlugin/images/cmstest-sample-logo.png'
+                                        )) ?>
         <?php endif ?>
       </div>

plugins/apostrophePlugin/branches/features/css/modules/aUserAdmin/config/generator.yml

@@ -2 +2 @@
   class: sfDoctrineGenerator
   param:
-    model_class:           sfGuardUser
-    theme:                 aAdmin
-    non_verbose_templates: true
-    with_show:             false
-    singular:              ~
-    plural:                ~
-    route_prefix:          a_user_admin
-    with_doctrine_route:     1
-    i18n_catalogue: apostrophe
+    model_class:            sfGuardUser
+    theme:                  aAdmin
+    non_verbose_templates:  true
+    with_show:              false
+    singular:               ~
+    plural:                 ~
+    route_prefix:           a_user_admin
+    with_doctrine_route:    1
+    i18n_catalogue:         apostrophe
 
     config:

plugins/apostrophePlugin/branches/features/css/web/css/a-reset.css

@@ -1 @@
-/* Eric Meyer's Reset CSS 
+/* Apostrophe UI Reset based on Eric Meyer's Reset CSS 
 -- http://meyerweb.com/eric/thoughts/2007/05/01/reset-reloaded/
 -------------------------------------------------------------------------- */
-* { margin: 0; padding: 0; font-weight: normal; } /* Safari seems to ignore a lot of the reset style sheet and I am not sure why. */
-
-html, body, div, span, applet, object, iframe, 
-h1, h2, h3, h4, h5, h6, p, blockquote, pre, a, 
-abbr, acronym, address, big, cite, code, del, dfn, 
-em, font, img, ins, kbd, q, s, samp, small, strike, 
-strong, sub, sup, tt, var, b, u, i, center, 
-dl, dt, dd, ol, ul, li, fieldset, form, label, 
-legend, table, caption, tbody, tfoot, thead, tr, th, td 
-{ 
-        margin: 0; padding: 0; border: 0; outline: 0; font-weight: inherit; font-style: inherit; font-size: 100%; font-family: inherit; vertical-align: baseline; 
-}
-
-:focus { outline: 0; } /* remember to define focus styles! */
-
-ins { text-decoration: none; } /* remember to highlight inserts somehow! */
-del { text-decoration: line-through; }
-
-table { border-collapse: separate; border-spacing: 0; } /* tables still need 'cellspacing="0"' in the markup */
-
-blockquote:before, blockquote:after, q:before, q:after { content: ""; }
-
-blockquote, q { quotes: "" ""; }
+.a-ui div, .a-ui span, .a-ui applet, .a-ui object, .a-ui iframe, .a-ui h1, .a-ui h2, .a-ui h3, .a-ui h4, .a-ui h5, .a-ui h6, .a-ui p, .a-ui blockquote, .a-ui pre, .a-ui a, .a-ui abbr, .a-ui acronym,.a-ui address,.a-ui big, .a-ui cite, .a-ui code, .a-ui del, .a-ui dfn, .a-ui em, .a-ui font, .a-ui img, .a-ui ins, .a-ui kbd, .a-ui q, .a-ui s, .a-ui samp, .a-ui small, .a-ui strike, .a-ui strong, .a-ui sub, .a-ui sup, .a-ui tt, .a-ui var, .a-ui b, .a-ui u, .a-ui i, .a-ui center, .a-ui dl, .a-ui dt, .a-ui dd, .a-ui ol, .a-ui ul, .a-ui li, .a-ui fieldset, .a-ui form, .a-ui label, .a-ui legend, .a-ui table, .a-ui caption, .a-ui tbody, .a-ui tfoot, .a-ui thead, .a-ui tr, .a-ui th, .a-ui td  { margin: 0; padding: 0; border: 0; outline: 0; font-weight: inherit; font-style: inherit; font-size: 100%; font-family: inherit; vertical-align: baseline; }