From 78bc45a78f250427b88e481691cb3e576722ad84 Mon Sep 17 00:00:00 2001
From: Lance Edgar <lance@edbob.org>
Date: Thu, 9 Aug 2012 09:45:15 -0700
Subject: [PATCH] template tweaks, misc. etc.

---
 edbob/pyramid/templates/edbob/base.mako       | 14 +++++------
 edbob/pyramid/templates/edbob/crud.mako       | 18 ++++++++++----
 edbob/pyramid/templates/forms/fieldset.mako   |  2 +-
 .../templates/forms/fieldset_readonly.mako    | 24 +++++++++----------
 edbob/pyramid/views/crud.py                   |  5 +---
 edbob/pyramid/views/grids/alchemy.py          |  6 ++---
 edbob/pyramid/views/grids/core.py             |  7 +++++-
 7 files changed, 42 insertions(+), 34 deletions(-)

diff --git a/edbob/pyramid/templates/edbob/base.mako b/edbob/pyramid/templates/edbob/base.mako
index c40deb8..346e5d7 100644
--- a/edbob/pyramid/templates/edbob/base.mako
+++ b/edbob/pyramid/templates/edbob/base.mako
@@ -43,13 +43,13 @@
         </div><!-- header -->
 
         <div id="body">
-##           % if request.session.peek_flash('error'):
-##               <div id="error-messages">
-##                 % for error in request.session.pop_flash('error'):
-##                     <div class="error">${error}</div>
-##                 % endfor
-##               </div>
-##           % endif
+          % if request.session.peek_flash('error'):
+              <div id="error-messages">
+                % for error in request.session.pop_flash('error'):
+                    <div class="error">${error}</div>
+                % endfor
+              </div>
+          % endif
           % if request.session.peek_flash():
               <div id="flash-messages">
                 % for msg in request.session.pop_flash():
diff --git a/edbob/pyramid/templates/edbob/crud.mako b/edbob/pyramid/templates/edbob/crud.mako
index e999beb..c3be02c 100644
--- a/edbob/pyramid/templates/edbob/crud.mako
+++ b/edbob/pyramid/templates/edbob/crud.mako
@@ -4,19 +4,27 @@
 
 <%def name="head_tags()">
   ${parent.head_tags()}
-  ${h.stylesheet_link(request.static_url('edbob.pyramid:static/css/crud.css'))}
+  <style type="text/css">
+
+    #context-menu {
+        float: right;
+    }
+
+    div.fieldset {
+        float: left;
+    }
+
+  </style>
 </%def>
 
 <%def name="context_menu_items()"></%def>
 
-<div class="crud wrapper">
+<div class="wrapper">
 
   <ul id="context-menu">
     ${self.context_menu_items()}
   </ul>
 
-  <div class="left">
-    ${fieldset.render()|n}
-  </div>
+  ${fieldset.render()|n}
 
 </div>
diff --git a/edbob/pyramid/templates/forms/fieldset.mako b/edbob/pyramid/templates/forms/fieldset.mako
index 365bb37..77789b9 100644
--- a/edbob/pyramid/templates/forms/fieldset.mako
+++ b/edbob/pyramid/templates/forms/fieldset.mako
@@ -9,7 +9,7 @@
 
   % for field in fieldset.render_fields.itervalues():
 
-      <div class="field-couple ${field.name}">
+      <div class="field-wrapper ${field.name}">
         % for error in field.errors:
             <div class="field-error">${error}</div>
         % endfor
diff --git a/edbob/pyramid/templates/forms/fieldset_readonly.mako b/edbob/pyramid/templates/forms/fieldset_readonly.mako
index 639ec0f..0eea814 100644
--- a/edbob/pyramid/templates/forms/fieldset_readonly.mako
+++ b/edbob/pyramid/templates/forms/fieldset_readonly.mako
@@ -1,12 +1,12 @@
-<table class="fieldset ${class_}">
-  <tbody>
-    %for field in fieldset.render_fields.itervalues():
-	%if field.requires_label:
-	    <tr class="${field.key}">
-	      <td class="label">${field.label()|h}</td>
-	      <td>${field.render_readonly()|n}</td>
-	    </tr>
-	%endif
-    %endfor
-  </tbody>
-</table>
\ No newline at end of file
+<div class="fieldset">
+  % for field in fieldset.render_fields.itervalues():
+      % if field.requires_label:
+          <div class="field-wrapper">
+            ${field.label_tag()|n}
+            <div class="field">
+              ${field.render_readonly()}
+            </div>
+          </div>
+      % endif
+  % endfor
+</div>
diff --git a/edbob/pyramid/views/crud.py b/edbob/pyramid/views/crud.py
index f138a29..5d17a62 100644
--- a/edbob/pyramid/views/crud.py
+++ b/edbob/pyramid/views/crud.py
@@ -40,6 +40,7 @@ class Crud(object):
     route_prefix = None
     url_prefix = None
     template_prefix = None
+    permission_prefix = None
 
     def __init__(self, request):
         self.request = request
@@ -62,10 +63,6 @@ class Crud(object):
     def cancel_route(self):
         return None
 
-    @property
-    def permission_prefix(self):
-        return self.route_prefix + 's'
-
     def make_fieldset(self, model, **kwargs):
         if 'action_url' not in kwargs:
             kwargs['action_url'] = self.request.current_route_url()
diff --git a/edbob/pyramid/views/grids/alchemy.py b/edbob/pyramid/views/grids/alchemy.py
index 743557a..d850e19 100644
--- a/edbob/pyramid/views/grids/alchemy.py
+++ b/edbob/pyramid/views/grids/alchemy.py
@@ -47,8 +47,7 @@ class AlchemyGridView(GridView):
         return self.make_query()
 
     def make_grid(self, **kwargs):
-        kwargs.setdefault('checkboxes', self.checkboxes)
-        kwargs.setdefault('partial_only', self.partial_only)
+        self.update_grid_kwargs(kwargs)
         return grids.AlchemyGrid(
             self.request, self.mapped_class, self._data, **kwargs)
 
@@ -92,8 +91,7 @@ class SortableAlchemyGridView(AlchemyGridView):
         return self.make_query()
 
     def make_grid(self, **kwargs):
-        kwargs.setdefault('checkboxes', self.checkboxes)
-        kwargs.setdefault('partial_only', self.partial_only)
+        self.update_grid_kwargs(kwargs)
         return grids.AlchemyGrid(
             self.request, self.mapped_class, self._data,
             sort_map=self.sort_map(), config=self._sort_config, **kwargs)
diff --git a/edbob/pyramid/views/grids/core.py b/edbob/pyramid/views/grids/core.py
index be713cf..9e34708 100644
--- a/edbob/pyramid/views/grids/core.py
+++ b/edbob/pyramid/views/grids/core.py
@@ -40,11 +40,16 @@ class GridView(View):
     renderer = None
     permission = None
     checkboxes = False
+    clickable = False
     partial_only = False
 
-    def make_grid(self, **kwargs):
+    def update_grid_kwargs(self, kwargs):
         kwargs.setdefault('checkboxes', self.checkboxes)
+        kwargs.setdefault('clickable', self.clickable)
         kwargs.setdefault('partial_only', self.partial_only)
+
+    def make_grid(self, **kwargs):
+        self.update_grid_kwargs(kwargs)
         return grids.Grid(self.request, **kwargs)
 
     def grid(self):