Changeset 1861

Timestamp:

07/27/10 16:16:09 (19 months ago)

Author:

johnnyoffline

Message:

I continued to work with a namespaced reset style. It uses the class .a-ui to scope a partial reset. I also tried to create a logged-in/logged-out separation of the styles but there are pieces of styles needed for logged in and logged out in every separate stylesheet despite the breakdown. really considering a further re-write. Throwing everything out and starting from the ground up. haha psych. but this is really difficult. my previous fix with ticket #36 needed another tweak, needed to check if you could edit the slot at all in addition to if there is a page- see footer partial or the layout.php

Location:

plugins/apostrophePlugin/branches/features/css

Files:

• lib/helper/aHelper.php (modified) (2 diffs)
• modules/a/templates/_area.php (modified) (3 diffs)
• modules/a/templates/_footer.php (modified) (2 diffs)
• modules/a/templates/_globalTools.php (modified) (2 diffs)
• modules/a/templates/layout.php (modified) (1 diff)
• web/css/a-area-slots.css (modified) (6 diffs)
• web/css/a-buttons.css (modified) (2 diffs)
• web/css/a-colors.css (modified) (4 diffs)
• web/css/a-components.css (modified) (5 diffs)
• web/css/a-ie.css (modified) (3 diffs)
• web/css/a-navigation.css (modified) (1 diff)
• web/css/a-reset.css (modified) (1 diff)

plugins/apostrophePlugin/branches/features/css/lib/helper/aHelper.php

@@ -9 +9 @@
 {
   $response = sfContext::getInstance()->getResponse();
+  $user = sfContext::getInstance()->getUser();
 
   sfContext::getInstance()->getConfiguration()->loadHelpers(
@@ -17 +18 @@
   if (sfConfig::get('app_a_use_bundled_stylesheet', true))
   {
-    $response->addStylesheet('/apostrophePlugin/css/a-reset.css');
+        
+                // This could be used as a way to manage what styles are included when logged in / out. 
+                // But it really seems like we use pieces of every one of these when logged in and out.
+                if ($user->isAuthenticated()) 
+                { 
+            $response->addStylesheet('/apostrophePlugin/css/a-reset.css');
+                } 
+
     $response->addStylesheet('/apostrophePlugin/css/a-utility.css');
     $response->addStylesheet('/apostrophePlugin/css/a-forms.css');

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

@@ -21 +21 @@
 <?php if (!$refresh): ?>
 
-  <div id="a-area-<?php echo "$pageid-$name" ?>" class="a-area <?php echo isset($options['area-class']) ? $options['area-class'] : "a-area-$name" ?>">
+  <div id="a-area-<?php echo "$pageid-$name" ?>" class="a-ui a-area <?php echo isset($options['area-class']) ? $options['area-class'] : "a-area-$name" ?>">
     
   <?php // Area Controls ?>
@@ -27 +27 @@
     <?php if ($infinite): ?>
 
-                <ul class="a-ui a-controls a-area-controls">
+                <ul class="a-controls a-area-controls">
 
                 <?php # Slot Controls ?>
@@ -76 +76 @@
                 <?php // Slot Controls ?>
     <?php if ($editable): ?>
-                <ul class="a-ui a-controls a-slot-controls">            
+                <ul class="a-controls a-slot-controls">         
       <?php if ($infinite): ?>
           <?php if ($i > 0): ?>

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

@@ -1 +1 @@
 <?php use_helper('a') ?>
+
 <?php $page = aTools::getCurrentNonAdminPage() ?>
         
@@ -7 +8 @@
   <?php a_slot('footer', 'aRichText', array(
                 'global' => true,
-                'edit' => isset($page) ? true : false,
+                'edit' => (isset($page) && $sf_user->hasCredential('cms_admin')) ? true : false,
         )) ?>
 <?php endif ?>

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

@@ -6 +6 @@
 <?php $cmsAdmin = $sf_user->hasCredential('cms_admin') ?>
 
-<div id="a-global-toolbar">
+<div class="a-ui a-global-toolbar">
 
         <ul class="a-ui a-controls">
@@ -12 +12 @@
           <?php if ($cmsAdmin || count($buttons) || $pageEdit): ?>
 
-                        <li><?php echo link_to(__('Apostrophe Now', null, 'apostrophe'),'@homepage', array('id' => 'the-apostrophe')) ?></li>
+                        <li><?php echo link_to(__('Apostrophe Now', null, 'apostrophe'),'@homepage', array('class' => 'the-apostrophe')) ?></li>
 
                         <?php foreach ($buttons as $button): ?>

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

@@ -59 +59 @@
           <?php a_slot('logo', 'aButton', array(
                                                 'global' => true, 
-                                                'edit' => isset($page) ? true : false,                          
+                                                'edit' => (isset($page) && $sf_user->hasCredential('cms_admin')) ? true : false,                                
                                                 'width' => 360, 
                                                 'flexHeight' => true, 

plugins/apostrophePlugin/branches/features/css/web/css/a-area-slots.css

@@ -47 +47 @@
 }
 
-.a-arrow-btn
-{ 
-float: left;
-/*border: 0;
-background-position: 0 0;*/
-cursor: pointer;
-}
-
-
 .a-slot.aRawHTML textarea
 { 
@@ -358 +349 @@
 -------------------------------------*/
 
-.a-ui.a-controls
+.a-controls
 { 
 position: relative;
@@ -366 +357 @@
 }
 
-.a-ui.a-controls li
+.a-controls li
 { /* All controls buttons are wrapped in a list. */
 float: left;
@@ -378 +369 @@
 }
 
-.a-ui.a-controls li.last
+.a-controls li.last
 { /* .last option has no margin */
         margin: 0 0 2px 0 !important;
 }
 
-.a-area > .a-ui.a-controls
+.a-area > .a-controls
 { 
 margin: 0 0 10px;
-background: #0e0;
-}
-
-.a-area.singleton > .a-ui.a-controls
+}
+
+.a-area.singleton > .a-controls
 { 
 position: absolute;
@@ -398 +388 @@
 }
 
-.a-area.singleton.aRichText > .a-ui.a-controls,
-.a-area.singleton.aText > .a-ui.a-controls,
-.a-area.singleton.aBlog > .a-ui.a-controls,
-.a-area.singleton.aBlogSingle > .a-ui.a-controls,
-.a-area.singleton.aEvent > .a-ui.a-controls,
-.a-area.singleton.aEventSingle > .a-ui.a-controls
+.a-area.singleton.aRichText > .a-controls,
+.a-area.singleton.aText > .a-controls,
+.a-area.singleton.aBlog > .a-controls,
+.a-area.singleton.aBlogSingle > .a-controls,
+.a-area.singleton.aEvent > .a-controls,
+.a-area.singleton.aEventSingle > .a-controls
 { /* Some Singleton Slots don't want Area Controls to sit on top of their content */
 position: relative;
@@ -444 +434 @@
 /* Options Element -- This creates a box for menu options and for slot options */
 
-.a-ui .a-options
+.a-ui .a-options,
+.a-options
 { 
 padding: 35px 5px 2px 5px;

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

@@ -1 @@
-
-
-
-
 /* 6. aUI Buttons
 -------------------------------------*/
-
+.a-ui .a-btn,
 .a-btn {
 position: relative;
@@ -118 +114 @@
 .a-btn.expanded .flag-label { display: block; }
 
+.a-arrow-btn
+{ 
+float: left;
+cursor: pointer;
+}
+
 .a-arrow-btn.icon.a-arrow-left,
-.a-arrow-btn.icon.a-arrow-right {/* Arrow Buttons do not use .a-btn */
+.a-arrow-btn.icon.a-arrow-right {
 text-indent: -9999px;
 padding: 0;

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

@@ -2 +2 @@
 -------------------------------------*/
 
-#a-global-toolbar #the-apostrophe
+.a-global-toolbar .the-apostrophe
 { /* Apostrophe */
         background-color: rgb(255,150,0);
@@ -18 +18 @@
 }
 
-.a-btn,
-.a-submit,
-.a-cancel
+.a-ui .a-btn,
+.a-ui .a-submit,
+.a-ui .a-cancel
 { /* Button Styles */
         background-color: rgb(255,150,0);
@@ -28 +28 @@
 }
 
-#the-apostrophe:hover,
+.the-apostrophe:hover,
 .a-btn:focus,
 .a-btn:hover,
@@ -76 +76 @@
 .a-admin .a-admin-content a:link, 
 .a-admin .a-admin-content a:visited,
-#a-global-toolbar #a-logged-in-as span,
+.a-global-toolbar #a-logged-in-as span,
 #a-personal-settings-heading span
 { /* Text Color */

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

@@ -1 +1 @@
 /* Attribution */
 /* IE6 Warning */
-/* Breadcrumb */
 /* Pager / Pagination */
 /* Global Toolbar */
@@ -167 +166 @@
 -------------------------------------*/
 
-#a-global-toolbar
+.a-global-toolbar
 {
 position: relative;
@@ -174 +173 @@
 width: 100%;
 border-bottom: 1px solid #ddd;
-padding: 5px 0 2px 0;
 margin-bottom: 5px;
 clear: both;
 z-index: 999;
 background:#fff;
-min-height: 24px;
-}
-
-#the-apostrophe { float: left; margin: 2px; height: 20px; width: 20px; text-indent: -9999px; background: url(/apostrophePlugin/images/apostrophe_logo_20px.png) center center no-repeat; overflow: hidden; }
-
-#a-global-toolbar .a-global-toolbar-buttons
-{
-float: left;
-margin-right: 5px;
-}
-
-#a-global-toolbar .a-login
+}
+
+.the-apostrophe { float: left; margin: 2px; height: 20px; width: 20px; text-indent: -9999px; background: url(/apostrophePlugin/images/apostrophe_logo_20px.png) center center no-repeat; overflow: hidden; }
+
+.a-global-toolbar > .a-controls
+{
+        margin-top: 5px;
+}
+
+.a-global-toolbar .a-login
 {
         float: right;
@@ -198 +194 @@
 }
 
-#a-global-toolbar .a-global-toolbar-this-page
+.a-global-toolbar .a-global-toolbar-this-page
 {
         position: relative;
@@ -210 +206 @@
 }
 
-#a-global-toolbar .a-global-toolbar-this-page.ok
+.a-global-toolbar .a-global-toolbar-this-page.ok
 {
         padding: 8px 0;

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

@@ -6 +6 @@
 -------------------------------------*/
 
-#a-global-toolbar #the-apostrophe
+.a-global-toolbar .the-apostrophe
 { /* Apostrophe */
 background-color: rgb(153,204,51);
@@ -23 +23 @@
 }
 
-#a-global-toolbar #a-logged-in-as span,
+.a-global-toolbar #a-logged-in-as span,
 #a-personal-settings-heading span
 { /* Text Color */
@@ -30 +30 @@
 
 input.checkbox,
-input.radio
+input.radio,
 {
+        width: auto;
         border: none !important;
 }

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

@@ -1 +1 @@
 .a-archived-page a
-{ /* aUI(); Makes Unpublished pages 50% Opacity */
+{ 
 text-decoration: line-through;
+opacity: 0.5; /* aUI(); Makes Unpublished pages 50% Opacity */
 }

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

@@ -2 +2 @@
 -- http://meyerweb.com/eric/thoughts/2007/05/01/reset-reloaded/
 -------------------------------------------------------------------------- */
-.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; }
+body { margin: 0; padding: 0; }
+
+.a-ui div, .a-ui span, .a-ui iframe, 
+.a-ui pre, .a-ui a, .a-ui img, 
+.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; 
+}