update new group request form

cyclestreets · May 17, 2015 · f42fc62 · f42fc62
1 parent 112c059
commit f42fc62
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 9 deletions.
diff --git a/app/assets/stylesheets/forms.css.scss b/app/assets/stylesheets/forms.css.scss
@@ -102,7 +102,7 @@ form.guided {
     }
   }
   li.input p.inline-hints {
-    margin-left: 160px;
+    margin-left: 60px;
     font: {
       style: italic;
       weight: normal;

diff --git a/app/views/group_requests/_form.html.haml b/app/views/group_requests/_form.html.haml
@@ -1,10 +1,10 @@
 = semantic_form_for @request, html: {class: 'guided'} do |f|
   = f.inputs do
     = f.input :name
-    = f.input :short_name
-    = f.input :website
+    = f.input :short_name, input_html: { style: "width:160px;" }
+    = f.input :website, placeholder: 'http:// ...'
     = f.input :email
-    = f.input :message
-    = f.input :default_thread_privacy, as: :select, collection: MessageThread::non_committee_privacies_map, include_blank: false
+    = f.input :message, input_html: { rows: "2", style: 'height:auto;' }
+    = f.input :default_thread_privacy, as: :select, collection: MessageThread::non_committee_privacies_map, selected: ''
   = f.actions do
     = f.action :submit, button_html: {class: "btn-green submit", data: { disable_with: t("formtastic.actions.saving") }}
diff --git a/config/locales/en-GB.yml b/config/locales/en-GB.yml
@@ -921,8 +921,8 @@
     low: "Marginal Interest"
     very_low: "Not of Interest"
   thread_privacy_options:
-    public: "Public"
-    group: "Group"
+    public: Public (everyone)
+    group: Group (members only)
     committee: "Committee"
   user_roles:
     member: "Member"

diff --git a/config/locales/forms.en-GB.yml b/config/locales/forms.en-GB.yml
@@ -23,9 +23,10 @@
         short_name: "Subdomain"
       group_request:
         name: Name of the group
-        short_name: Subdomain (at .cyclescape.org)
+        short_name: Web address
         website: Your organisation's main website
         email: Your organisation's main e-mail address
+        default_thread_privacy: Default privacy for discussion threads
       group_membership:
         role: "Membership type"
       group_pref:
@@ -81,7 +82,7 @@
       group:
         short_name: "Must be lower-case alphanumeric; a-z, 0-9"
       group_request:
-        short_name: "Must be lower-case alphanumeric; a-z, 0-9"
+        short_name: ".cyclescape.org"
         message: A short message to explain the group (helps us stop spam requests)
       group_membership:
         email: "Please enter their email. If this matches an existing Cyclescape account they will be added to the group immediately. Otherwise an invitation to join Cyclescape will be sent to this address."