Merge branch 'issue50'

Fixes okfde#50, fixes okfde#53, thanks @felixebert
JenMysoc · Apr 23, 2013 · 577a0b7 · 577a0b7
2 parents 47e54ef + b6484c7
commit 577a0b7
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 18 deletions.
diff --git a/froide/account/forms.py b/froide/account/forms.py
@@ -16,18 +16,18 @@ class NewUserForm(forms.Form):
     first_name = forms.CharField(max_length=30,
             label=_('First name'),
             widget=forms.TextInput(attrs={'placeholder': _('First Name'),
-                'class': 'span2'}))
+                'class': 'input-medium'}))
     last_name = forms.CharField(max_length=30,
             label=_('Last name'),
             widget=forms.TextInput(attrs={'placeholder': _('Last Name'),
-                'class': 'span2'}))
+                'class': 'input-medium'}))
     address = forms.CharField(max_length=300,
             required=False,
             label=_('Mailing Address'),
             help_text=_('Your address will not be displayed publicly and is only needed in case a public body needs to send you paper.'),
             widget=forms.Textarea(attrs={
                 'rows': '3',
-                'class': 'span3',
+                'class': 'input-large',
                 'placeholder': _('Street, Post Code, City'),
             }))
     user_email = forms.EmailField(label=_('Email address'),

diff --git a/froide/foirequest/forms.py b/froide/foirequest/forms.py
@@ -33,12 +33,12 @@ class RequestForm(forms.Form):
     subject = forms.CharField(label=_("Subject"),
             widget=forms.TextInput(
                 attrs={'placeholder': _("Subject"),
-                "class": "span5"}))
+                "class": "span8"}))
     body = forms.CharField(label=_("Body"),
             widget=forms.Textarea(
                 attrs={
                     'placeholder': _("Specify your request here..."),
-                    "class": "span4"
+                    "class": "span11"
                 }))
     public = forms.BooleanField(required=False, initial=True,
             label=_("This request will be public immediately."))

diff --git a/froide/foirequest/templates/foirequest/request.html b/froide/foirequest/templates/foirequest/request.html
@@ -139,8 +139,8 @@ <h3>{% blocktrans %}A request about an opinion{% endblocktrans %}</h3>
   <fieldset id="write-request">
     <legend>{% blocktrans %}Step 3 - Write the Request{% endblocktrans %}</legend>
     <div class="js-hidden" id="step-message">
-      <div class="row">
-        <div class="span9">
+      <div class="row-fluid">
+        <div class="span12">
           <div class="">
             <p>{% blocktrans %}Please have a look if the information you are looking for is already available online.{% endblocktrans %}</p>
             <ul id="check-list">
@@ -165,8 +165,8 @@ <h3>{% blocktrans %}A request about an opinion{% endblocktrans %}</h3>
           {% endif %}
         </div>
       </div>
-      <div class="row">
-        <div class="span5">
+      <div class="row-fluid">
+        <div class="span7">
           <label for="id_body">{% blocktrans %}Your Request:{% endblocktrans %}</label>
           {{ request_form.body.errors }}
           <div class="letter">
@@ -185,15 +185,15 @@ <h3>{% blocktrans %}A request about an opinion{% endblocktrans %}</h3>
                   {{ user_form.first_name.errors }}
                   {{ user_form.last_name.errors }}
                   <p>
-                    {{ user_form.first_name }}
-                    {{ user_form.last_name }}
+                    <div class="inline">{{ user_form.first_name }}</div>
+                    <div class="inline">{{ user_form.last_name }}</div>
                   </p>
                 </div>
               {% endif %}
             </div>
           </div>
         </div>
-        <div class="span4">
+        <div class="span5">
           <div id="law-description"{% if not request_form.default_law.description %} style="display:none"{% endif %}>
             <h4>{% blocktrans %}Legal Explanation:{% endblocktrans %}</h4>
               <div id="law-description-text">{{ request_form.default_law.description|markdown }}</div>
@@ -211,15 +211,15 @@ <h4>{% blocktrans %}Important Notes:{% endblocktrans %}</h4>
       </div>
       <hr/>
       {% if user.is_authenticated %}
-        <div class="user_data_form row">
-          <div class="span5">
+        <div class="user_data_form row-fluid">
+          <div class="span8">
             <p>{% blocktrans %}Your Post Address:{% endblocktrans %}<br/><strong><span id="post_address">{{ user.get_profile.address }}</span></strong></p>
             <p>{% blocktrans %}Your Email Address:{% endblocktrans %} <strong><span id="email_address">{{ user.email }}</span></strong></p>
           </div>
         </div>
       {% else %}
-        <div class="row">
-          <div class="span9">
+        <div class="row-fluid">
+          <div class="span12">
             <div class="well user_data_form">
               <label for="id_user_email">{% blocktrans %}Your email address{% endblocktrans %}</label>
               {{ user_form.user_email.errors }}
@@ -245,8 +245,8 @@ <h4>{% blocktrans %}Important Notes:{% endblocktrans %}</h4>
           </div>
         </div>
       {% endif %}
-      <div class="row">
-        <div class="span9">
+      <div class="row-fluid">
+        <div class="span12">
           <div class="well">
             <label class="checkbox">
               {{ request_form.public }}