fixed: change password template

xinuc · Jun 14, 2008 · fc3a4be · fc3a4be
1 parent 49104af
commit fc3a4be
Show file tree

Hide file tree

Showing 10 changed files with 65 additions and 58 deletions.
diff --git a/History.txt b/History.txt
@@ -1,3 +1,6 @@
+== 0.5.7 2008-06-
+* Fixed: Change password template, removed ajax usage. Issue: http://stonean.com/issues/show/5
+
 == 0.5.6 2008-06-05
 * Fixed: Misspelling of respond_to?, for some reason I keep thinking responds_to?
 

diff --git a/Manifest.txt b/Manifest.txt
@@ -45,7 +45,6 @@ rails_generators/lockdown/templates/app/views/user_groups/new.html.erb
 rails_generators/lockdown/templates/app/views/user_groups/show.html.erb
 rails_generators/lockdown/templates/app/views/users/_data.html.erb
 rails_generators/lockdown/templates/app/views/users/_form.html.erb
-rails_generators/lockdown/templates/app/views/users/_password.html.erb
 rails_generators/lockdown/templates/app/views/users/edit.html.erb
 rails_generators/lockdown/templates/app/views/users/index.html.erb
 rails_generators/lockdown/templates/app/views/users/new.html.erb

diff --git a/rails_generators/lockdown/lockdown_generator.rb b/rails_generators/lockdown/lockdown_generator.rb
@@ -68,9 +68,6 @@ def add_management(m)
 
     copy_views(m, "users")
 
-    m.file "app/views/users/_password.html.erb",
-      "app/views/users/_password.html.erb"
-
     copy_views(m, "user_groups")
 
     m.file "app/views/permissions/_data.html.erb",

diff --git a/rails_generators/lockdown/templates/app/views/users/_data.html.erb b/rails_generators/lockdown/templates/app/views/users/_data.html.erb
@@ -45,14 +45,15 @@ li.odd_checked{
   <%= user_login_value %>
 </p>
 
-<% unless @action_name == "show" -%>
-	<p id="password">
-		<% if @user.new_record? %>
-			<%= render :partial => "password" %>
-		<% else %>
-			<a href="#" onclick="change_password()">Change Password</a><br/>
-		<% end %>
-	</p>
+<% unless action_name == "show" -%>
+  <p>
+    <b><span>P</span>assword</b><br />
+    <%= user_password_value  %>
+  </p>
+  <p>
+    <b><span>P</span>assword confirmation</b><br />
+    <%= user_password_confirmation_value %>
+  </p>
 <% end -%>
 
 <p>

diff --git a/rails_generators/lockdown/templates/app/views/users/_form.html.erb b/rails_generators/lockdown/templates/app/views/users/_form.html.erb
@@ -3,12 +3,6 @@
   submit_label = "Create" if @user.new_record?
 -%>
 
-<script type="text/javascript">
-	function change_password()
-	{
-		new Ajax.Request("/users/change_password", {asynchronous: true, postBody: 'authenticity_token=<%= form_authenticity_token %>'});
-	}
-</script>
 <%= error_messages_for :profile %>
 <%= error_messages_for :user %>
 

diff --git a/rails_generators/lockdown/templates/app/views/users/_password.html.erb b/rails_generators/lockdown/templates/app/views/users/_password.html.erb
diff --git a/website/generator.html b/website/generator.html
@@ -221,12 +221,33 @@ <h2>Permissions</h2>
 	<p>For simplicity sake, I would like the documentation for init.rb contained within that file.</p>
 
 
+	<h2>Github</h2>
+
+
+	<p>The Clone <span class="caps">URL</span>: git://github.com/stonean/lockdown.git</p>
+
+
+	<p>Read the <a href="http://drnicwilliams.com/2007/06/01/8-steps-for-fixing-other-peoples-code/">8 steps for fixing other people&#8217;s code</a>.</p>
+
+
+	<p>I&#8217;m new to git and this whole opensource project admin gig, so please be patient with my stumbling around.</p>
+
+
 	<h2>Contact</h2>
 
 
-	<p>Comments and suggestions are welcome via the <a href="http://groups.google.com/group/stonean_lockdown?hl=en">forum</a></p>
+	<p>Please use the <a href="http://stonean.com/projects/lockdown/boards">forum</a> to ask questions and the <a href="http://stonean.com/projects/lockdown/issues">issue tracker</a> to report problems or submit a pull request.</p>
+
+
+	<h2>License</h2>
+
+
+	<p>This code is free to use under the terms of the <span class="caps">MIT</span> license.</p>
+
+
+	<p>Copyright&#169; 2008 Andrew Stone</p>
     <p class="coda">
-      22nd May 2008<br/>
+      11th June 2008<br/>
       Theme extended from <a href="http://rb2js.rubyforge.org/">Paul Battley</a>
     </p>
 </div>

diff --git a/website/generator.txt b/website/generator.txt
@@ -168,7 +168,21 @@ I guess that wasn't sufficient? If you don't understand how to use init.rb, plea
 
 For simplicity sake, I would like the documentation for init.rb contained within that file. 
 
+h2. Github
+
+The Clone URL: git://github.com/stonean/lockdown.git
+
+Read the "8 steps for fixing other people's code":http://drnicwilliams.com/2007/06/01/8-steps-for-fixing-other-peoples-code/.
+
+I'm new to git and this whole opensource project admin gig, so please be patient with my stumbling around.
+
 h2. Contact
 
-Comments and suggestions are welcome via the "forum":http://groups.google.com/group/stonean_lockdown?hl=en
+Please use the "forum":http://stonean.com/projects/lockdown/boards to ask questions and the "issue tracker":http://stonean.com/projects/lockdown/issues to report problems or submit a pull request.
+
+h2. License
+
+This code is free to use under the terms of the MIT license.
+
+Copyright (c) 2008 Andrew Stone
 
diff --git a/website/index.html b/website/index.html
@@ -289,42 +289,33 @@ <h2>Roadmap to 1.0</h2>
   <li><strong>1.0.0: </strong>Model level security</li>
 </ul>
 
-	<h2>Google Group</h2>
-
-
-	<p>If you are having a problem understanding how to use Lockdown, please post your question on the lockdown group.  If it&#8217;s documentation related, I will keep this page updated to help everyone.</p>
-
-
-	<p><a href="http://groups.google.com/group/stonean_lockdown?hl=en">http://groups.google.com/group/stonean_lockdown?hl=en</a></p>
-
-
-	<h2>How to submit patches</h2>
+	<h2>Github</h2>
 
 
 	<p>The Clone <span class="caps">URL</span>: git://github.com/stonean/lockdown.git</p>
 
 
-	<p>Read the <a href="http://drnicwilliams.com/2007/06/01/8-steps-for-fixing-other-peoples-code/">8 steps for fixing other people&#8217;s code</a> and for section <a href="http://drnicwilliams.com/2007/06/01/8-steps-for-fixing-other-peoples-code/#8b-google-groups">8b: Submit patch to Google Groups</a>, use the Google Group above.</p>
+	<p>Read the <a href="http://drnicwilliams.com/2007/06/01/8-steps-for-fixing-other-peoples-code/">8 steps for fixing other people&#8217;s code</a>.</p>
 
 
 	<p>I&#8217;m new to git and this whole opensource project admin gig, so please be patient with my stumbling around.</p>
 
 
-	<h2>License</h2>
+	<h2>Contact</h2>
 
 
-	<p>This code is free to use under the terms of the <span class="caps">MIT</span> license.</p>
+	<p>Please use the <a href="http://stonean.com/projects/lockdown/boards">forum</a> to ask questions and the <a href="http://stonean.com/projects/lockdown/issues">issue tracker</a> to report problems or submit a pull request.</p>
 
 
-	<h2>Contact</h2>
+	<h2>License</h2>
 
 
-	<p>Comments and suggestions are welcome via the <a href="http://groups.google.com/group/stonean_lockdown?hl=en">google group</a></p>
+	<p>This code is free to use under the terms of the <span class="caps">MIT</span> license.</p>
 
 
-	<p><a href="http://blog.stonean.com">Andrew Stone</a></p>
+	<p>Copyright&#169; 2008 Andrew Stone</p>
     <p class="coda">
-      2nd June 2008<br/>
+      11th June 2008<br/>
       Theme extended from <a href="http://rb2js.rubyforge.org/">Paul Battley</a>
     </p>
 </div>

diff --git a/website/index.txt b/website/index.txt
@@ -238,29 +238,21 @@ h2. Roadmap to 1.0
   <li><strong>1.0.0: </strong>Model level security</li>
 </ul>
 
-h2. Google Group
-
-If you are having a problem understanding how to use Lockdown, please post your question on the lockdown group.  If it's documentation related, I will keep this page updated to help everyone. 
-
-"http://groups.google.com/group/stonean_lockdown?hl=en":http://groups.google.com/group/stonean_lockdown?hl=en
-
-
-h2. How to submit patches
+h2. Github
 
 The Clone URL: git://github.com/stonean/lockdown.git
 
-Read the "8 steps for fixing other people's code":http://drnicwilliams.com/2007/06/01/8-steps-for-fixing-other-peoples-code/ and for section "8b: Submit patch to Google Groups":http://drnicwilliams.com/2007/06/01/8-steps-for-fixing-other-peoples-code/#8b-google-groups, use the Google Group above.
+Read the "8 steps for fixing other people's code":http://drnicwilliams.com/2007/06/01/8-steps-for-fixing-other-peoples-code/.
 
 I'm new to git and this whole opensource project admin gig, so please be patient with my stumbling around.
 
-h2. License
-
-This code is free to use under the terms of the MIT license.
+h2. Contact
 
+Please use the "forum":http://stonean.com/projects/lockdown/boards to ask questions and the "issue tracker":http://stonean.com/projects/lockdown/issues to report problems or submit a pull request.
 
-h2. Contact
+h2. License
 
-Comments and suggestions are welcome via the "google group":http://groups.google.com/group/stonean_lockdown?hl=en
+This code is free to use under the terms of the MIT license.
 
-<a href="http://blog.stonean.com">Andrew Stone</a>
+Copyright (c) 2008 Andrew Stone