instedd-rails 0.0.17 → 0.0.18

data/README.markdown

@@ -92,3 +92,10 @@ You can use the INSTEDD\_THEME environment variable to use a different
 url for the theme. For example:
 
     INSTEDD_THEME=http://localhost rails s
+
+If you have the [platform-common](https://bitbucket.org/instedd/platform-common) project checkout out locally you
+can serve it with this command line:
+
+    sudo python -m SimpleHTTPServer 80
+
+(be sure to run <code>rake</code> in that project before serving it)

data/app/views/devise/passwords/edit.html.erb

@@ -1,28 +1,25 @@
 <%= devise_error_messages! :class => 'centered w30' %>
 
 <div class="box centered w30">
+  <%= form_for(resource, :as => resource_name, :url => password_path(resource_name), :html => { :method => :put }) do |f| %>
+    <h2>Change your password</h2>
 
-<%= form_for(resource, :as => resource_name, :url => password_path(resource_name), :html => { :method => :put }) do |f| %>
-  <h2>Change your password</h2>
-  
-  <hr class="shadow"/>
-  
-  <%= f.hidden_field :reset_password_token %>
+    <hr class="shadow"/>
 
-  <div class="field w30">
-    <%= f.label :password, "New password" %>
-    <%= f.password_field :password %>
-  </div>
+    <%= f.hidden_field :reset_password_token %>
 
-  <div class="field w30">
-    <%= f.label :password_confirmation, "Confirm new password" %>
-    <%= f.password_field :password_confirmation %>
-  </div>
+    <div class="field w30">
+      <%= f.label :password, "New password" %>
+      <%= f.password_field :password %>
+    </div>
 
-  <div class="actions">
-    <button type="submit" class="white">Change my password</button>
-  </div>
-  
-<% end %>
+    <div class="field w30">
+      <%= f.label :password_confirmation, "Confirm new password" %>
+      <%= f.password_field :password_confirmation %>
+    </div>
 
+    <div class="actions">
+      <button type="submit" class="white">Change my password</button>
+    </div>
+  <% end %>
 </div>

data/app/views/devise/registrations/edit.html.haml

@@ -0,0 +1,27 @@
+= devise_error_messages!
+= form_for(resource, :as => resource_name, :url => registration_path(resource_name), :html => { :method => :put }) do |f|
+  %h2 Edit settings
+  .field.w30
+    = f.label :email, "Email"
+    = f.email_field :email, :readonly => true
+  .field.w30
+    = f.label :current_password, "Current password"
+    %p (we need your current password to confirm your changes)
+    = f.password_field :current_password
+  .ux-collapsible.collapsed.w30{"data-on-expanded" => "box grey"}
+    %span
+      %a.fsettings{:href => "#"} Change my password
+    .ux-content
+      .field.w30
+        = f.label :password, "New password"
+        %p (leave blank if you don't want to change it)
+        = f.password_field :password
+      .field.w30
+        = f.label :password_confirmation, "Confirm new password"
+        = f.password_field :password_confirmation
+  .actions
+    %button.white{:type => "submit"} Update
+    = link_to "Back", :back
+  %hr.w30/
+  %p
+    = link_to "Delete my account", registration_path(resource_name), :confirm => "Are you sure?", :method => :delete, :class => 'fdelete'

data/instedd-rails.gemspec

@@ -20,4 +20,5 @@ Gem::Specification.new do |s|
 
   s.add_dependency("rails", ">= 3.0")
   s.add_dependency("breadcrumbs_on_rails", ">= 2.2.0")
+  s.add_dependency('haml-rails')
 end

data/lib/instedd_rails/version.rb

@@ -1,3 +1,3 @@
 module InsteddRails
-    VERSION = "0.0.17"
+    VERSION = "0.0.18"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: instedd-rails
 version: !ruby/object:Gem::Version
-  version: 0.0.17
+  version: 0.0.18
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-05-02 00:00:00.000000000 Z
+date: 2012-05-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &70159582980480 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,15 @@ dependencies:
         version: '3.0'
   type: :runtime
   prerelease: false
-  version_requirements: *70159582980480
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: breadcrumbs_on_rails
-  requirement: &70159582979980 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,7 +37,28 @@ dependencies:
         version: 2.2.0
   type: :runtime
   prerelease: false
-  version_requirements: *70159582979980
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 2.2.0
+- !ruby/object:Gem::Dependency
+  name: haml-rails
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: This gem unifies all the helpers and common views used by all Instedd
   applications
 email:
@@ -56,6 +82,7 @@ files:
 - app/views/devise/confirmations/new.html.erb
 - app/views/devise/passwords/edit.html.erb
 - app/views/devise/passwords/new.html.erb
+- app/views/devise/registrations/edit.html.haml
 - app/views/devise/sessions/new.html.erb
 - app/views/devise/shared/_links.erb
 - app/views/devise/unlocks/new.html.erb
@@ -112,7 +139,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: instedd-rails
-rubygems_version: 1.8.10
+rubygems_version: 1.8.21
 signing_key: 
 specification_version: 3
 summary: Instedd Platform Common helpers for Rails