Commit: 36f02a9f3e7b31282bb74732481af7b0aa425441 - allura (git)

allura

Commit MetaInfo

• Révision: 36f02a9f3e7b31282bb74732481af7b0aa425441 (tree)
• l'heure: 2011-03-01 01:00:36
• Auteur: Jenny Steele <jsteele@geek...>
• Commiter: Jenny Steele

Message de Log

[#1528] Cleanup for oauth page

Signed-off-by: Jenny Steele <[e-mail]>

Change Summary

• modified: Allura/allura/lib/widgets/forms.py
• modified: Allura/allura/lib/widgets/oauth_widgets.py
• modified: Allura/allura/templates/widgets/forge_form.html

Modification

--- a/Allura/allura/lib/widgets/forms.py
+++ b/Allura/allura/lib/widgets/forms.py
@@ -17,6 +17,7 @@ class ForgeForm(ew.SimpleForm):
     defaults=dict(
         ew.SimpleForm.defaults,
         submit_text='Save',
+        style='standard',
         method='post',
         enctype=None)
 

--- a/Allura/allura/lib/widgets/oauth_widgets.py
+++ b/Allura/allura/lib/widgets/oauth_widgets.py
@@ -11,6 +11,7 @@ from .forms import ForgeForm
 
 class OAuthApplicationForm(ForgeForm):
     submit_text='Register new applicaiton'
+    style='wide'
     class fields(ew_core.NameList):
         application_name =ew.TextField(label='Application Name',
                                        validator=V.UniqueOAuthApplicationName())

--- a/Allura/allura/templates/widgets/forge_form.html
+++ b/Allura/allura/templates/widgets/forge_form.html
@@ -1,27 +1,31 @@
 <form method="{{method}}"
       {% if enctype %}enctype="{{enctype}}"{% endif %}
       action="{{action}}">
+  {% set extra_width = 0 %}
+  {% if style == 'wide' %}
+    {% set extra_width = 4 %}
+  {% endif %}
   {% if errors and not errors.iteritems and show_errors %}
-  <div class="grid-19"><span {{widget.j2_attrs({'class':error_class})}}>{{errors}}</span></div>
+  <div class="grid-{{19 + extra_width}}"><span {{widget.j2_attrs({'class':error_class})}}>{{errors}}</span></div>
   {% endif %}
   {% for field in widget.fields %}
     {% set ctx=widget.context_for(field) %}
     {% if field.field_type != 'hidden' %}
       {% if ctx.errors and field.show_errors -%}
-      <div class="grid-19"><span {{widget.j2_attrs({'class':error_class})}}>{{ctx.errors}}</span></div>
+      <div class="grid-{{19 + extra_width}}"><span {{widget.j2_attrs({'class':error_class})}}>{{ctx.errors}}</span></div>
       {%- endif %}
       {% if field.show_label and field.label %}
       <label for="{{ctx.id}}" class="grid-4">{{field.label}}:</label>
-      <div class="grid-15">{{field.display(**ctx)}}</div>
+      <div class="grid-{{15 + extra_width}}">{{field.display(**ctx)}}</div>
       {% else %}
-      <div class="grid-19">{{field.display(**ctx)}}</div>
+      <div class="grid-{{19 + extra_width}}">{{field.display(**ctx)}}</div>
       {% endif %}
     {% else %}
       {{field.display(**ctx)}}
     {% endif %}
   {% endfor %}
   <label class="grid-4">&nbsp;</label>
-  <div class="grid-15">
+  <div class="grid-{{15 + extra_width}}">
     {% for b in buttons %}
       {{b.display()}}
     {% endfor %}