Merge branch 'develop' of https://github.com/leapcode/leap_web into feature/expose_admin_in_api

7 files changed, 15 insertions, 49 deletions

diff --git a/app/views/users/_change_password.html.haml b/app/views/users/_change_password.html.haml
index 425e3ee..64a4d0a 100644
--- a/app/views/users/_change_password.html.haml
+++ b/app/views/users/_change_password.html.haml
@@ -15,7 +15,7 @@
     = f.input :login, :label => t(:username), :required => false, :input_html => {:id => :srp_username}
   = f.input :password, :required => false, :validate => true, :input_html => { :id => :srp_password }
   = f.input :password_confirmation, :required => false, :input_html => { :id => :srp_password_confirmation }
-  .control-group
+  .form-group
     .controls
       = f.submit t(:save), :class => 'btn btn-primary'
 
diff --git a/app/views/users/_change_pgp_key.html.haml b/app/views/users/_change_pgp_key.html.haml
index e465125..af3eb5e 100644
--- a/app/views/users/_change_pgp_key.html.haml
+++ b/app/views/users/_change_pgp_key.html.haml
@@ -8,6 +8,6 @@
 = simple_form_for [:api, @user], form_options do |f|
   %legend= t(:advanced_options)
   = f.input :public_key, :as => :text, :hint => t(:use_ascii_key), :input_html => {:class => "full-width", :rows => 4}
-  .control-group
+  .form-group
     .controls
       = f.submit t(:save), :class => 'btn', :data => {"loading-text" => "Saving..."}
diff --git a/app/views/users/_change_service_level.html.haml b/app/views/users/_change_service_level.html.haml
index 42315a2..32ea8c0 100644
--- a/app/views/users/_change_service_level.html.haml
+++ b/app/views/users/_change_service_level.html.haml
@@ -1,8 +1,13 @@
--# TODO: probably won't want here, but here for now. Also, we will need way to ensure payment if they pick a non-free plan.
--#
--# SERVICE LEVEL
--#
-- if APP_CONFIG[:service_levels]
+:ruby
+  # DISABLED! this form points to a route that does not exist.
+  #   It's a draft for implementing service levels.
+  # TODO: probably won't want here, but here for now.
+  #       We will need way to ensure payment for a non-free plan.
+  #
+  # SERVICE LEVEL
+  #
+  #
+- if APP_CONFIG[:service_levels] && false
   - form_options = {:html => {:class => user_form_class('form-horizontal'), :id => 'update_service_level', :data => {token: session[:token]}}, :validate => true}
   = simple_form_for @user, form_options do |f|
     %legend= t(:service_level)
@@ -13,6 +18,6 @@
       %p
       = t(:effective_service_level)
       = f.select :effective_service_level_code, ServiceLevel.select_options, :selected => @user.effective_service_level.id
-    .control-group
+    .form-group
       .controls
         = f.submit t(:save), :class => 'btn', :data => {"loading-text" => "Saving..."}
diff --git a/app/views/users/_contact_email.html.haml b/app/views/users/_contact_email.html.haml
index ad768b7..1627ff6 100644
--- a/app/views/users/_contact_email.html.haml
+++ b/app/views/users/_contact_email.html.haml
@@ -4,6 +4,6 @@
   = f.input :contact_email, :label => false
   -# %p= t(:public_key)
   -# = f.text_area :contact_email_key, {:class => "full-width", :rows => 4}
-  .control-group
+  .form-group
     .controls
       = f.submit t(:save), :class => 'btn', :data => {"loading-text" => "Saving..."}
\ No newline at end of file
diff --git a/app/views/users/_warnings.html.haml b/app/views/users/_warnings.html.haml
deleted file mode 100644
index baf80a4..0000000
--- a/app/views/users/_warnings.html.haml
+++ /dev/null
@@ -1,12 +0,0 @@
-%noscript
-  %div.alert.alert-error=t :js_required_html
-#cookie_warning.alert.alert-error{:style => "display:none"}
-  =t :cookie_disabled_warning
-:javascript
-  document.cookie = "testing=cookies_enabled; path=/";
-  if(document.cookie.indexOf("testing=cookies_enabled") < 0)
-  {
-    document.getElementById('cookie_warning').style.display = 'block';
-  } else {
-    document.getElementById('cookie_warning').style.display = 'none';
-  }
diff --git a/app/views/users/new.html.haml b/app/views/users/new.html.haml
deleted file mode 100644
index bc0b1af..0000000
--- a/app/views/users/new.html.haml
+++ /dev/null
@@ -1,27 +0,0 @@
--#
--# This form is handled entirely by javascript
--# Please take care when changing element ids.
--# 
--# The form is hidden when no js is available 
--# to prevent submission in the clear.
--#
-
-- form_options = {url: '/not-used', html: {id: 'new_user', class: user_form_class('form-horizontal'), style: 'display:none'}, validate: true}
-
-.span1
-.span9
-  %h2=t :signup
-  .lead=t :signup_info
-  = render :partial => 'warnings'
-  = simple_form_for(@user, form_options) do |f|
-    = f.input :login, :label => t(:username), :required => false, :input_html => { :id => :srp_username }
-    = f.input :password, :label => t(:password), :required => false, :validate => true, :input_html => { :id => :srp_password }
-    = f.input :password_confirmation, :label => t(:password_confirmation), :required => false, :validate => true, :input_html => { :id => :srp_password_confirmation }
-
-    - if APP_CONFIG[:invite_required]
-      = f.input :invite_code, :label => t(:invite_code), :input_html => { :id => :srp_invite_code }
-    - else
-      = f.input :invite_code, :as => "hidden", :input_html => { :value => " ", :id => :srp_invite_code }
-
-    = f.button :wrapped, cancel: home_path
--#
diff --git a/app/views/users/show.html.haml b/app/views/users/show.html.haml
index da8e467..3bdf952 100644
--- a/app/views/users/show.html.haml
+++ b/app/views/users/show.html.haml
@@ -1,6 +1,6 @@
 = render 'overview'
 .container-fluid
-  .row-fluid
+  .row
     %h4 To use bitmask services:
     = btn client_download_url, type: "primary" do
       %i.icon-arrow-down.icon-white