summaryrefslogtreecommitdiffstats
path: root/app/views/account
diff options
context:
space:
mode:
authorJean-Philippe Lang <jp_lang@yahoo.fr>2007-03-12 17:59:02 +0000
committerJean-Philippe Lang <jp_lang@yahoo.fr>2007-03-12 17:59:02 +0000
commit027bf93849e82ef3c60e4a3024db49d65f0fb3c9 (patch)
treec6bc438fcd50370944b94f605b3f34fe54b73248 /app/views/account
parent071f8e18d02f789149071abb8e052bae7ad01003 (diff)
downloadredmine-027bf93849e82ef3c60e4a3024db49d65f0fb3c9.tar.gz
redmine-027bf93849e82ef3c60e4a3024db49d65f0fb3c9.zip
added svn:eol-style native property on /app files
git-svn-id: http://redmine.rubyforge.org/svn/trunk@333 e93f8b46-1217-0410-a6f0-8f06a7374b81
Diffstat (limited to 'app/views/account')
-rw-r--r--app/views/account/login.rhtml40
-rw-r--r--app/views/account/lost_password.rhtml26
-rw-r--r--app/views/account/password_recovery.rhtml18
-rw-r--r--app/views/account/register.rhtml18
-rw-r--r--app/views/account/show.rhtml50
5 files changed, 76 insertions, 76 deletions
diff --git a/app/views/account/login.rhtml b/app/views/account/login.rhtml
index 5a94cb1ed..73f6fe49f 100644
--- a/app/views/account/login.rhtml
+++ b/app/views/account/login.rhtml
@@ -1,24 +1,24 @@
-<center>
-<div class="box login">
+<center>
+<div class="box login">
<h2 class="icon22 icon22-authent"><%=l(:label_please_login)%></h2>
-
-<% form_tag({:action=> "login"}, :class => "tabular") do %>
-<p><label for="login"><%=l(:field_login)%>:</label>
-<%= text_field_tag 'login', nil, :size => 25 %></p>
-
-<p><label for="password"><%=l(:field_password)%>:</label>
-<%= password_field_tag 'password', nil, :size => 25 %></p>
-
+
+<% form_tag({:action=> "login"}, :class => "tabular") do %>
+<p><label for="login"><%=l(:field_login)%>:</label>
+<%= text_field_tag 'login', nil, :size => 25 %></p>
+
+<p><label for="password"><%=l(:field_password)%>:</label>
+<%= password_field_tag 'password', nil, :size => 25 %></p>
+
<p><center><input type="submit" name="login" value="<%=l(:button_login)%> &#187;" class="primary" /></center>
-<% end %>
-
-<br>
-<% links = []
- links << link_to(l(:label_register), :action => 'register') if Setting.self_registration?
- links << link_to(l(:label_password_lost), :action => 'lost_password') if Setting.lost_password?
-%>
-<%= links.join(" | ") %>
-</p>
+<% end %>
+
+<br>
+<% links = []
+ links << link_to(l(:label_register), :action => 'register') if Setting.self_registration?
+ links << link_to(l(:label_password_lost), :action => 'lost_password') if Setting.lost_password?
+%>
+<%= links.join(" | ") %>
+</p>
-</div>
+</div>
</center> \ No newline at end of file
diff --git a/app/views/account/lost_password.rhtml b/app/views/account/lost_password.rhtml
index ebc64e326..b27123a6e 100644
--- a/app/views/account/lost_password.rhtml
+++ b/app/views/account/lost_password.rhtml
@@ -1,14 +1,14 @@
-<center>
-<div class="box login">
-<h2><%=l(:label_password_lost)%></h2>
-
-<% form_tag({:action=> "lost_password"}, :class => "tabular") do %>
-
-<p><label for="mail"><%=l(:field_mail)%> <span class="required">*</span></label>
-<%= text_field_tag 'mail', nil, :size => 40 %></p>
-
-<p><center><%= submit_tag l(:button_submit) %></center></p>
-
-<% end %>
-</div>
+<center>
+<div class="box login">
+<h2><%=l(:label_password_lost)%></h2>
+
+<% form_tag({:action=> "lost_password"}, :class => "tabular") do %>
+
+<p><label for="mail"><%=l(:field_mail)%> <span class="required">*</span></label>
+<%= text_field_tag 'mail', nil, :size => 40 %></p>
+
+<p><center><%= submit_tag l(:button_submit) %></center></p>
+
+<% end %>
+</div>
</center> \ No newline at end of file
diff --git a/app/views/account/password_recovery.rhtml b/app/views/account/password_recovery.rhtml
index 2aa581042..89b105292 100644
--- a/app/views/account/password_recovery.rhtml
+++ b/app/views/account/password_recovery.rhtml
@@ -1,21 +1,21 @@
<center>
<div class="box login">
<h2><%=l(:label_password_lost)%></h2>
-
-<p><%=l(:field_login)%>: <strong><%= @user.login %></strong><br />
+
+<p><%=l(:field_login)%>: <strong><%= @user.login %></strong><br />
<%= error_messages_for 'user' %>
-
+
<% form_tag({:token => @token.value}, :class => "tabular") do %>
-
+
<p><label for="new_password"><%=l(:field_new_password)%> <span class="required">*</span></label>
- <%= password_field_tag 'new_password', nil, :size => 25 %></p>
-
+ <%= password_field_tag 'new_password', nil, :size => 25 %></p>
+
<p><label for="new_password_confirmation"><%=l(:field_password_confirmation)%> <span class="required">*</span></label>
- <%= password_field_tag 'new_password_confirmation', nil, :size => 25 %></p>
+ <%= password_field_tag 'new_password_confirmation', nil, :size => 25 %></p>
<p><center><%= submit_tag l(:button_save) %></center></p>
- <% end %>
-
+ <% end %>
+
</div>
</center> \ No newline at end of file
diff --git a/app/views/account/register.rhtml b/app/views/account/register.rhtml
index ac16c3b49..ef9a12ac0 100644
--- a/app/views/account/register.rhtml
+++ b/app/views/account/register.rhtml
@@ -7,7 +7,7 @@
<!--[form:user]-->
<p><label for="user_login"><%=l(:field_login)%> <span class="required">*</span></label>
<%= text_field 'user', 'login', :size => 25 %></p>
-
+
<p><label for="password"><%=l(:field_password)%> <span class="required">*</span></label>
<%= password_field_tag 'password', nil, :size => 25 %></p>
@@ -16,22 +16,22 @@
<p><label for="user_firstname"><%=l(:field_firstname)%> <span class="required">*</span></label>
<%= text_field 'user', 'firstname' %></p>
-
+
<p><label for="user_lastname"><%=l(:field_lastname)%> <span class="required">*</span></label>
<%= text_field 'user', 'lastname' %></p>
<p><label for="user_mail"><%=l(:field_mail)%> <span class="required">*</span></label>
-<%= text_field 'user', 'mail' %></p>
-
+<%= text_field 'user', 'mail' %></p>
+
<p><label for="user_language"><%=l(:field_language)%></label>
-<%= select("user", "language", lang_options_for_select) %></p>
-
+<%= select("user", "language", lang_options_for_select) %></p>
+
<% for @custom_value in @custom_values %>
<p><%= custom_field_tag_with_label @custom_value %></p>
-<% end %>
-
+<% end %>
+
<p><label for="user_mail_notification"><%=l(:field_mail_notification)%></label>
-<%= check_box 'user', 'mail_notification' %></p>
+<%= check_box 'user', 'mail_notification' %></p>
<!--[eoform:user]-->
</div>
diff --git a/app/views/account/show.rhtml b/app/views/account/show.rhtml
index c686b709c..19fedb3b6 100644
--- a/app/views/account/show.rhtml
+++ b/app/views/account/show.rhtml
@@ -1,26 +1,26 @@
-<h2><%= @user.display_name %></h2>
-
-<p>
-<%= mail_to @user.mail unless @user.pref.hide_mail %>
-<ul>
- <li><%=l(:label_registered_on)%>: <%= format_date(@user.created_on) %></li>
-<% for custom_value in @custom_values %>
-<% if !custom_value.value.empty? %>
- <li><%= custom_value.custom_field.name%>: <%=h show_value(custom_value) %></li>
-<% end %>
-<% end %>
-</ul>
-</p>
-
-<h3><%=l(:label_project_plural)%></h3>
-<p>
-<% for membership in @user.memberships %>
- <%= membership.project.name %> (<%= membership.role.name %>, <%= format_date(membership.created_on) %>)
- <br />
-<% end %>
-</p>
-
-<h3><%=l(:label_activity)%></h3>
-<p>
-<%=l(:label_reported_issues)%>: <%= Issue.count(["author_id=?", @user.id]) %>
+<h2><%= @user.display_name %></h2>
+
+<p>
+<%= mail_to @user.mail unless @user.pref.hide_mail %>
+<ul>
+ <li><%=l(:label_registered_on)%>: <%= format_date(@user.created_on) %></li>
+<% for custom_value in @custom_values %>
+<% if !custom_value.value.empty? %>
+ <li><%= custom_value.custom_field.name%>: <%=h show_value(custom_value) %></li>
+<% end %>
+<% end %>
+</ul>
+</p>
+
+<h3><%=l(:label_project_plural)%></h3>
+<p>
+<% for membership in @user.memberships %>
+ <%= membership.project.name %> (<%= membership.role.name %>, <%= format_date(membership.created_on) %>)
+ <br />
+<% end %>
+</p>
+
+<h3><%=l(:label_activity)%></h3>
+<p>
+<%=l(:label_reported_issues)%>: <%= Issue.count(["author_id=?", @user.id]) %>
</p> \ No newline at end of file