Remove trailing whitespace and tabs

This commit is contained in:
Matt Rogers 2014-08-14 21:05:05 -05:00
parent 863d780ad0
commit aa41e20e46
84 changed files with 407 additions and 407 deletions

View file

@ -4,7 +4,7 @@ VERSION:2.0
CALSCALE:GREGORIAN
METHOD:PUBLISH
X-WR-CALNAME:Tracks
<% for todo in @due_all
<% for todo in @due_all
due_date = todo.due
overdue_text = ""
if due_date.at_midnight < Time.zone.now.at_midnight

View file

@ -4,16 +4,16 @@
# rendering of "due in x days" that change without touching updated at of the todo
cache [context, source_view_key, current_user.date.strftime("%Y%m%d"), @tag_name] do
-%>
<%=
render :partial => 'todos/collection',
:object => @not_done,
<%=
render :partial => 'todos/collection',
:object => @not_done,
:locals => { :settings => {
:id => "c#{context.id}",
:collapsible => settings[:collapsible],
:container_name => 'context',
:id => "c#{context.id}",
:collapsible => settings[:collapsible],
:container_name => 'context',
:title => show_context_name(context),
:show_empty_containers => settings[:show_empty_containers],
:parent_container_type => settings[:parent_container_type]
}}
}}
%>
<% end %>
<% end %>

View file

@ -3,11 +3,11 @@
<span id="<%= state %>-contexts-count" class="badge"><%= context_state_group.length %></span>
<%= t("states.contexts."+ state) %>
</h2>
<div id="<%= state%>-contexts-empty-nd" style="<%= no_contexts ? 'display:block' : 'display:none'%>">
<div class="message"><p><%= t('contexts.no_contexts_' + state) %></p></div>
</div>
<div id="list-contexts-<%= state %>">
<%= render :partial => 'context_listing', :collection => context_state_group %>
</div>

View file

@ -1,4 +1,4 @@
<%
<%
suffix_completed = t('contexts.last_completed_in_context', :number=>prefs.show_number_completed)
deferred_pending_options = {:append_descriptor => nil, :parent_container_type => 'context'}
done_todo_options = {:append_descriptor => suffix_completed, :suppress_context => true, :parent_container_type => 'context'}
@ -7,16 +7,16 @@
<div id="display_box">
<%= empty_message_holder("not_done_context", @not_done_todos.empty?) %>
<%= show_grouped_todos({:collapsible => false, :show_empty_containers => false, :parent_container_type => 'context'}) %>
<%= show_grouped_todos({:collapsible => false, :show_empty_containers => false, :parent_container_type => 'context'}) %>
<% if @group_view_by == 'project' -%>
<%= show_todos_without_project(@todos_without_project, {:collapsible => false, :parent_container_type => 'context', :title_param => @context.name}) -%>
<% end -%>
<%= show_deferred_pending_todos(@deferred_todos, @pending_todos, deferred_pending_options) %>
<%= show_deferred_pending_todos(@deferred_todos, @pending_todos, deferred_pending_options) %>
<%= show_done_todos(@done, done_todo_options) unless @done.nil? %>
<%= show_done_todos(@done, done_todo_options) unless @done.nil? %>
</div>
<div id="input_box">

View file

@ -1,4 +1,4 @@
<%-
<%-
object_name = unique_object_name_for("update_context_#{@context.id}")
-%>
var <%=object_name%> = {
@ -47,4 +47,4 @@ var <%=object_name%> = {
<% end -%>
}
<%=object_name%>.animate();
<%=object_name%>.animate();

View file

@ -1,11 +1,11 @@
<h3>Map fields to be imported<h3>
<%= form_tag csv_import_data_path do %>
<% @labels.each do |l| %>
<%= label_tag l %>:
<%= label_tag l %>:
<%= select_tag(l, options_for_select(@headers) ) %>
<br>
<% end %>
<%= hidden_field_tag :file, @filename %>
<%= hidden_field_tag :import_to, @import_to %>
<%= submit_tag "Import" %>
<% end %>
<%= submit_tag "Import" %>
<% end %>

View file

@ -10,9 +10,9 @@
<br><br>
<%= file_field_tag :file %>
<%= submit_tag "Upload", :id => "upload_form_submit" %>
<% end %>
<% end %>
</div>
</div>
</div>
</div>

View file

@ -31,6 +31,6 @@
<td>XML-Datei mit all Ihren Aktionen, Umgebungen, Projekten, Tags und Notizen</td>
<td><%= link_to "XML file (actions only)", :controller => 'data', :action => 'xml_export' %></td>
</tr>
</table>
</table>
</div><!-- End of feeds -->
</div>

View file

@ -28,7 +28,7 @@ tell application "Mail"
end tell
on importMessage(theMessage)
-- Get the info from the email message
tell application "Mail"
try
@ -36,37 +36,37 @@ on importMessage(theMessage)
set theSubject to subject of theMessage
if theSubject is equal to "" then set theSubject to emptySubject
set theMessageId to message id of theMessage
-- Construct the description string from the email info
set myDesc to "Email " & theSender & " about " & theSubject
-- Trim the string to 100 characters otherwise it won't validate
if length of myDesc > 100 then
set myDesc to characters 1 thru 100 of myDesc
end if
set myNote to "message://<" & theMessageId & ">"
end try
end tell
-- Now send all that info to Tracks
-- Edit the URL of your Tracks installation if necessary"
tell application "<%= root_url %>backend/api"
set returnValue to call xmlrpc {method name:"NewTodo", parameters:{myUsername, myToken, myContextID, myDesc, myNote}}
end tell
(* Growl support - comment out or delete this section if
you don't have Growl *)
tell application "GrowlHelperApp"
set the allNotificationsList to ¬
{"Tracks Notification"}
-- Make a list of the notifications
-- that will be enabled by default.
-- Those not enabled by default can be enabled later
-- in the 'Applications' tab of the growl prefpane.
set the enabledNotificationsList to ¬
{"Tracks Notification"}
-- Register our script with growl.
-- You can optionally (as here) set a default icon
-- for this script's notifications.
@ -78,5 +78,5 @@ on importMessage(theMessage)
notify with name "Tracks Notification" title "New action sent to Tracks" description growlDescription application name "Tracks Applescript" icon of application "Script Editor.app"
end tell
(* End of Growl section *)
end importMessage

View file

@ -1,10 +1,10 @@
using terms from application "Quicksilver"
on process text ThisClipping
set myUsername to "<%= current_user.login %>"
set myToken to "<%= current_user.token %>"
set myContextID to <%= context.id %> (* <%= context.name %> *)
tell application "<%= root_url %>backend/api"
set returnValue to call xmlrpc {method name:"NewTodo", parameters:{myUsername, myToken, myContextID, ThisClipping}}
end tell
@ -12,4 +12,4 @@ using terms from application "Quicksilver"
show notification "Tracks: action added."
end tell
end process text
end using terms from
end using terms from

View file

@ -5,9 +5,9 @@ xml.OpenSearchDescription 'xmlns' => "http://a9.com/-/spec/opensearch/1.1/" do
xml.ShortName Tracks
xml.Description t('integrations.opensearch_description')
xml.InputEncoding 'UTF-8'
xml.Image("data:image/x-icon;base64," + @icon_data,
xml.Image("data:image/x-icon;base64," + @icon_data,
'width' => '16', 'height' => '16')
xml.Url 'type' => 'text/html', 'method' => 'GET',
xml.Url 'type' => 'text/html', 'method' => 'GET',
'template' => url_for(:controller => 'search', :action => 'results',
:only_path => false) + '?search={searchTerms}'
end

View file

@ -56,7 +56,7 @@
<ul>
<li><%= navigation_link( t('common.contexts'), contexts_path, {:accesskey=>"c", :title=>t('layouts.navigation.contexts_title')} ) %></li>
<li><%= navigation_link( t('common.notes'), notes_path, {:accesskey => "o", :title => t('layouts.navigation.notes_title')} ) %></li>
<li><%= navigation_link( t('common.review'), review_path, {:accesskey => "r", :title => t('layouts.navigation.review_title')} ) %></li>
<li><%= navigation_link( t('common.review'), review_path, {:accesskey => "r", :title => t('layouts.navigation.review_title')} ) %></li>
<li><%= navigation_link( t('layouts.navigation.recurring_todos'), {:controller => "recurring_todos", :action => "index"}, :title => t('layouts.navigation.recurring_todos_title')) %></li>
</ul>
</li>

View file

@ -1,7 +1,7 @@
<% note = notes_summary -%>
<div class="note_wrapper" id="<%= dom_id(note) %>">
<div class="note_link">
<%= link_to(
<%= link_to(
image_tag("blank.png", :border => 0),
note,
:title => t('notes.show_note_title'),

View file

@ -7,16 +7,16 @@
<%= form_for(@prefs) do %>
<div id="tabs">
<ul>
<ul>
<li><a href="#tabs-1"><%= t('preferences.tabs.profile')%></a></li>
<li><a href="#tabs-2"><%= t('preferences.tabs.authentication')%></a></li>
<li><a href="#tabs-3"><%= t('preferences.tabs.date_and_time')%></a></li>
<li><a href="#tabs-4"><%= t('preferences.tabs.tracks_behavior')%></a></li>
</ul>
<div id="tabs-1"><%= render :partial => 'profile'%></div>
<div id="tabs-2"><%= render :partial => 'authentication'%></div>
<div id="tabs-3"><%= render :partial => 'date_and_time'%></div>
<div id="tabs-4"><%= render :partial => 'tracks_behavior'%></div>
<div id="tabs-1"><%= render :partial => 'profile'%></div>
<div id="tabs-2"><%= render :partial => 'authentication'%></div>
<div id="tabs-3"><%= render :partial => 'date_and_time'%></div>
<div id="tabs-4"><%= render :partial => 'tracks_behavior'%></div>
</div>
<br/>
@ -24,4 +24,4 @@
<button type="submit" id="prefs_submit"><%= t('common.update') %></button>
<% end %>
</div>
</div>

View file

@ -2,20 +2,20 @@
@not_done = @not_done_todos.select {|t| t.project_id == project.id }
# invalidate the cache every day because of staleness or
# rendering of "due in x days" that change without touching updated at of the todo
cache [project, source_view_key, current_user.date.strftime("%Y%m%d"), @tag_name] do
cache [project, source_view_key, current_user.date.strftime("%Y%m%d"), @tag_name] do
-%>
<%=
<%=
title = source_view_is(:project) ? t('projects.actions_in_project_title') : show_project_name(project)
render(:partial => 'todos/collection',
:object => @not_done,
render(:partial => 'todos/collection',
:object => @not_done,
:locals => { :settings => {
:id => "p#{project.id}",
:collapsible => settings[:collapsible],
:title => title,
:id => "p#{project.id}",
:collapsible => settings[:collapsible],
:title => title,
:container_name => 'project',
:show_empty_containers => settings[:show_empty_containers],
:parent_container_type => settings[:parent_container_type]
}})
%>
<% end -%>
<% end -%>

View file

@ -1,6 +1,6 @@
<%
paginate_options = {
:class => :add_note_link,
:class => :add_note_link,
:previous_label => '&laquo; '+ t('common.previous'),
:next_label => t('common.next')+' &raquo;',
:inner_window => 2
@ -10,7 +10,7 @@
<div id="projects-empty-nd" style="<%= @no_projects ? 'display:block' : 'display:none'%>">
<div class="message"><p><%= t('projects.no_projects') %></p></div>
</div>
<div class="project-state-group" id="list-completed-projects-container" <%= " style=\"display:none\"" if @no_projects %>>
<div class="paginate_header"><%= will_paginate @projects, paginate_options %></div>
<h2>
@ -34,4 +34,4 @@
:id => "completed_actionize_link", :class => "actionize_link", :title => t('common.sort.by_task_count_title'), :x_confirm_message => t('common.sort.by_task_count_title_confirm')) %>
</div>
</div>
</div>
</div>

View file

@ -4,7 +4,7 @@
selector_project = "div##{dom_id(@project)}"
selector_project = "div.project-edit-current " + selector_project unless @source_view=="project"
object_name = unique_object_name_for("edit_project_#{@project.id}")
-%>
-%>
var <%=object_name%> = {
animate: function() {
<%=object_name%>.replace_project_with_edit_form();
@ -28,4 +28,4 @@ var <%=object_name%> = {
}
}
<%=object_name%>.animate();
<%=object_name%>.animate();

View file

@ -1,8 +1,8 @@
<%
<%
deferred_pending_options = {:append_descriptor => nil, :parent_container_type => 'project'}
done_todo_options = {
:append_descriptor => t('projects.last_completed_in_project', :number=>prefs.show_number_completed),
:suppress_project => true,
:append_descriptor => t('projects.last_completed_in_project', :number=>prefs.show_number_completed),
:suppress_project => true,
:parent_container_type => 'project'
}
if @not_done_todos.count == 0
@ -22,7 +22,7 @@
<%= show_deferred_pending_todos(@deferred_todos, @pending_todos, deferred_pending_options) %>
<%= show_done_todos(@done, done_todo_options) unless @done.nil? %>
<div class="container">
<div id="notes">
<div class="add_note_link"><%= link_to t('projects.add_note'), '#' %> </div>
@ -43,4 +43,4 @@
<div id="input_box">
<%= render :partial => "shared/add_new_item_form" %>
<%= render :file => "sidebar/sidebar" %>
</div>
</div>

View file

@ -1,4 +1,4 @@
<%-
<%-
object_name = unique_object_name_for("update_project_#{@project.id}")
-%>
var <%=object_name%> = {
@ -9,7 +9,7 @@ var <%=object_name%> = {
html_for_error_messages: function() {
return "<%= js_error_messages_for(@project) %>";
}
<%-
<%-
else
-%>
animate: function() {
@ -46,7 +46,7 @@ var <%=object_name%> = {
},
remove_project_edit_form: function() {
<%-
# do not remove() edit form as this will remove the DIV
# do not remove() edit form as this will remove the DIV
# that is needed to replace with the new form, so only empty the DIV
-%>
$('#<%=dom_id(@project, 'edit')%>').hide(500, function() {
@ -95,4 +95,4 @@ var <%=object_name%> = {
<% end # if @saved -%>
}
<%=object_name%>.animate();
<%=object_name%>.animate();

View file

@ -1,6 +1,6 @@
<%
paginate_options = {
:class => :add_note_link,
:class => :add_note_link,
:previous_label => '&laquo; '+ t('common.previous'),
:next_label => t('common.next')+' &raquo;',
:inner_window => 2
@ -21,4 +21,4 @@
</div>
<div class="paginate_footer"><%= will_paginate @completed_recurring_todos, paginate_options %></div>
</div>
</div>
</div>

View file

@ -2,10 +2,10 @@
var <%=object_name%> = {
animate: function() {
$('#edit-recurring-todo').html(<%=object_name%>.html_for_edit_form());
$('#edit-recurring-todo').dialog( "open" );
$('#edit-recurring-todo').dialog( "open" );
},
html_for_edit_form: function() {
return "<%= js_render('edit_form') %>";
}
}
<%=object_name%>.animate();
<%=object_name%>.animate();

View file

@ -2,7 +2,7 @@
TracksPages.page_error('<%= t('todos.error_completing_todo', :description => @recurring_todo.description) %>');
<%- else
object_name = unique_object_name_for("toggle_check_rec")
-%>
-%>
var <%=object_name%> = {
animate: function() {
TracksPages.set_page_badge(<%= @down_count %>);
@ -16,7 +16,7 @@ var <%=object_name%> = {
$('#<%=dom_id(@recurring_todo)%>').slideUp(1000, function() {
$('#<%=dom_id(@recurring_todo)%>').remove();
<%=object_name%>.show_empty_messages();
<%- if @recurring_todo.completed? -%>
<%=object_name%>.add_recurring_todo_to_completed_container();
<%- else -%>
@ -48,4 +48,4 @@ var <%=object_name%> = {
}
<%=object_name%>.animate();
<%- end -%>
<%- end -%>

View file

@ -3,6 +3,6 @@
<a href="https://github.com/TracksApp/tracks/wiki"><%= t('common.wiki')%></a> |
<a href="http://groups.google.com/group/TracksApp"><%= t('common.mailing_list')%></a> |
<a href="http://getontracks.org/"><%= t('common.website')%></a> |
<a href="http://getontracks.org/development/"><%= t('common.contribute')%></a> |
<a href="http://getontracks.org/development/"><%= t('common.contribute')%></a> |
<%= link_to(t('layouts.navigation.mobile'), todos_path(:format => 'm')) %></p>
</div>

View file

@ -1,5 +1,5 @@
<%-
url = url_for :controller => 'stats', :action => 'actions_done_last_years'
<%-
url = url_for :controller => 'stats', :action => 'actions_done_last_years'
-%>
&title=<%= t('stats.actions_lastyear_title') %>,{font-size:16},&
&y_legend=<%= t('stats.legend.number_of_actions') %>,12,0x736AFF&

View file

@ -4,20 +4,20 @@
&y_ticks=5,10,5&
&filled_bar=50,0x9933CC,0x8010A0,<%= t('stats.labels.created') %>,8&
&filled_bar_2=50,0x0066CC,0x0066CC,<%= t('stats.labels.completed') %>,8&
&values=<%
&values=<%
0.upto 22 do |i| -%>
<%=@actions_creation_hour_array[i] -%>,
<% end -%><%=@actions_creation_hour_array[23]%>&
&values_2=<%
&values_2=<%
0.upto 22 do |i| -%>
<%=@actions_completion_hour_array[i] -%>,
<% end -%><%=@actions_completion_hour_array[23]%>&
&x_labels= <%
&x_labels= <%
0.upto 22 do |i| -%>
<%=i-%>,
<% end -%>23&
&y_min=0&
<% # add one to @max for people who have no actions completed yet.
<% # add one to @max for people who have no actions completed yet.
# OpenFlashChart cannot handle y_max=0 -%>
&y_max=<%=@max+1 -%>&
&x_label_style=9,,1,1&
&x_label_style=9,,1,1&

View file

@ -4,20 +4,20 @@
&y_ticks=5,10,5&
&filled_bar=50,0x9933CC,0x8010A0,<%= t('stats.labels.created') %>,8&
&filled_bar_2=50,0x0066CC,0x0066CC,<%= t('stats.labels.completed') %>,8&
&values=<%
&values=<%
0.upto 22 do |i| -%>
<%=@actions_creation_hour_array[i] -%>,
<% end -%><%=@actions_creation_hour_array[23]%>&
&values_2=<%
&values_2=<%
0.upto 22 do |i| -%>
<%=@actions_completion_hour_array[i] -%>,
<% end -%><%=@actions_completion_hour_array[23]%>&
&x_labels= <%
&x_labels= <%
0.upto 22 do |i| -%>
<%=i-%>,
<% end -%>23&
&y_min=0&
<% # add one to @max for people who have no actions completed yet.
<% # add one to @max for people who have no actions completed yet.
# OpenFlashChart cannot handle y_max=0 -%>
&y_max=<%=@max+1 -%>&
&x_label_style=9,,1,1&
&x_label_style=9,,1,1&

View file

@ -10,7 +10,7 @@
<%= render :partial => "todos/todo", :collection => @done_recently, :locals => { :parent_container_type => "completed", :suppress_context => false, :suppress_project => false } %>
<% end -%>
</div>
<div class="container">
<div class=add_note_link><%= link_to t('common.show_all'), done_projects_path%></div>
<h2>
@ -39,5 +39,5 @@
<%= render :partial => @last_completed_recurring_todos %>
<% end -%>
</div>
</div>

View file

@ -1,8 +1,8 @@
<%=
<%=
settings[:show_container] = !collection.empty? || settings[:show_empty_containers]
todos_container(settings) do
todos_container_header(settings) +
todos_container_items(collection, settings)
end
%>
todos_container_items(collection, settings)
end
%>

View file

@ -1,8 +1,8 @@
<%=
<%=
settings[:show_container] = !collection.empty? || settings[:show_empty_containers]
todos_container(settings) do
todos_container_header(settings) +
todos_container_items(collection, settings)
end
%>
todos_container_items(collection, settings)
end
%>

View file

@ -7,9 +7,9 @@ cache [successor, "successor"] do
<div id="<%= dom_id(successor, 'successor_line') %>">
<div class="description<%= staleness_class( successor ) %>" style="margin-left: 20px">
<span class="todo.descr"><%= h sanitize(successor.description) %></span>
<%= remote_delete_dependency(successor, predecessor) %>
<% unless successor.pending_successors.empty?
if @rec_depth < 8
@rec_depth+=1 %>
@ -29,4 +29,4 @@ cache [successor, "successor"] do
</div>
</div>
</div>
<% end %>
<% end %>

View file

@ -1,5 +1,5 @@
animate: function() {
<%-
<%-
animation = []
animation << "remove_todo" if update_needs_to_remove_todo_from_container
if replace_with_updated_todo
@ -106,10 +106,10 @@ regenerate_predecessor_family: function() {
parents = @todo.predecessors.to_a
until parents.empty?
parent = parents.pop
parents += parent.predecessors
parents += parent.predecessors
-%>
$('#<%= dom_id(parent) %>').html("<%= escape_javascript(render(:partial => parent, :locals => { :settings => {:parent_container_type => parent_container_type }})) %>");
<%
end
-%>
}
}

View file

@ -18,7 +18,7 @@
<%= render :partial => "todos/todo", :collection => @done, :locals => { :parent_container_type => "completed", :suppress_context => false, :suppress_project => false } %>
<% end -%>
</div>
<div class="paginate_footer"><%= will_paginate @done, paginate_options %></div>
</div>

View file

@ -8,7 +8,7 @@
animation = []
if should_show_new_item
if should_add_new_container
if should_add_new_container
animation << "insert_new_container_with_new_todo";
else
animation << "add_todo_to_existing_container";
@ -41,13 +41,13 @@
empty_id = '#no_todos_in_view'
empty_id = '#deferred_pending_container-empty-d' if source_view_is :tickler
-%>
$('<%=empty_id%>').slideUp(100, function() {
$('<%=empty_id%>').slideUp(100, function() {
$('#display_box').prepend(html_for_new_container());
next_steps.go();
next_steps.go();
});
}
function add_todo_to_existing_container(next_steps) {
function add_todo_to_existing_container(next_steps) {
$('#<%= empty_container_msg_div_id %>').hide();
$('#<%= item_container_id(@todo) %>_items').append(html_for_new_todo());
$('#<%= item_container_id(@todo) %>').slideDown(500, function() {
@ -71,7 +71,7 @@
}
function html_for_new_container() {
<%
<%
want_render = @group_view_by == 'project' ? @new_project_created : @new_context_created
container = @group_view_by == 'project' ? @todo.project : @todo.context
%>
@ -81,5 +81,5 @@
function html_for_new_todo() {
return "<%= @saved ? js_render(@todo, { :parent_container_type => parent_container_type, :source_view => @source_view }) : "" %>";
}
<% end -%>
<% end -%>

View file

@ -5,8 +5,8 @@
<%= show_completed_todos_for("rest_of_month", @done_rest_of_month) %>
<p>
<%= raw t('todos.see_all_completed',
:link => link_to(t("todos.all_completed_here"), determine_all_done_path))
<%= raw t('todos.see_all_completed',
:link => link_to(t("todos.all_completed_here"), determine_all_done_path))
%>
</p>

View file

@ -1,10 +1,10 @@
<%- object_name = unique_object_name_for("edit_todo_#{@todo.id}") %>
function add_spec(id, spec) {
<%-
# do this outside of object_name to fill spec_of_todo in
# global namespace, not in namespace of object. Otherwise
# spec_of_todo is not available for the js attached to the
<%-
# do this outside of object_name to fill spec_of_todo in
# global namespace, not in namespace of object. Otherwise
# spec_of_todo is not available for the js attached to the
# edit form
-%>
spec_of_todo[id] = spec;
@ -37,4 +37,4 @@ var <%=object_name%> = {
}
}
<%=object_name%>.animate();
<%=object_name%>.animate();

View file

@ -1,8 +1,8 @@
<%
<%
options = {
:collapsible => false,
:parent_container_type => 'tag',
:title_param => @tag_title
:title_param => @tag_title
}
deferred_pending_options=options.clone.merge({:deferred => @deferred_todos, :pending => @pending_todos})
hidden_options = options.clone
@ -28,4 +28,4 @@
<div id="input_box">
<%= render :partial => "shared/add_new_item_form" %>
<%= render :file => "sidebar/sidebar" %>
</div>
</div>

View file

@ -1,11 +1,11 @@
<% unless @saved -%>
TracksPages.page_error("<%= t('todos.error_toggle_complete') %>");
<% else
# create a unique object name to prevent concurrent toggles to overwrite each other functions
<% else
# create a unique object name to prevent concurrent toggles to overwrite each other functions
object_name = unique_object_name_for("toggle_check")
-%>
var <%= object_name %> = {
animate: function() {
animate: function() {
<% if @wants_redirect_after_complete && @todo.completed? -%>
<%=object_name%>.redirect_after_complete();
<% else
@ -182,4 +182,4 @@ var <%= object_name %> = {
}
<%=object_name%>.animate();
<% end -%>
<% end -%>

View file

@ -1,5 +1,5 @@
<div id="single_box" class="container context authtype_container">
<h2><%= t('users.change_authentication_type') %></h2>
<%= get_list_of_error_messages_for @user %>
@ -7,12 +7,12 @@
<p><%= t('users.select_authentication_type') %></p>
<%= form_tag :action => 'update_auth_type' do %>
<div><label for="user_auth_type"><%= t('users.label_auth_type') %>:</label> <%= select('user', 'auth_type', Tracks::Config.auth_schemes.collect {|p| [ p, p ] }) %></div>
<div id="open_id" style="display:<%= current_user.auth_type == 'open_id' ? 'block' : 'none' %>"><label for="openid_url"><%= t('users.identity_url') %>:</label> <input type="text" name="openid_url" value="<%= current_user.open_id_url %>" class="open_id" /></div>
<div class="actions"><%= submit_tag t('users.auth_change_submit') %> <%= link_to t('common.cancel'), preferences_path %></div>
<div><label for="user_auth_type"><%= t('users.label_auth_type') %>:</label> <%= select('user', 'auth_type', Tracks::Config.auth_schemes.collect {|p| [ p, p ] }) %></div>
<div id="open_id" style="display:<%= current_user.auth_type == 'open_id' ? 'block' : 'none' %>"><label for="openid_url"><%= t('users.identity_url') %>:</label> <input type="text" name="openid_url" value="<%= current_user.open_id_url %>" class="open_id" /></div>
<div class="actions"><%= submit_tag t('users.auth_change_submit') %> <%= link_to t('common.cancel'), preferences_path %></div>
<%= observe_field( :user_auth_type, :function => "$('#open_id')[0].style.display = value == 'open_id' ? 'block' : 'none'") %>
<%= observe_field( :user_auth_type, :function => "$('#open_id')[0].style.display = value == 'open_id' ? 'block' : 'none'") %>
<% end %>
</div>

View file

@ -2,8 +2,8 @@
<p><%= t('users.total_users_count', :count => "<span id=\"user_count\">#{@total_users}</span>").html_safe %></p>
<table class="users_table">
<tr>
<table class="users_table">
<tr>
<th><%= User.human_attribute_name('login') %></th>
<th><%= User.human_attribute_name('display_name') %></th>
<th><%= User.human_attribute_name('auth_type') %></th>
@ -13,7 +13,7 @@
<th><%= t('users.total_projects') %></th>
<th><%= t('users.total_notes') %></th>
<th>&nbsp;</th>
</tr>
</tr>
<% for user in @users %>
<tr <%= "class=\"highlight\"" if user.is_admin? %> id="user-<%= user.id %>">
<td><%=h user.login %></td>

View file

@ -4,7 +4,7 @@
<%= get_list_of_error_messages_for @user %><br/>
<%= render_flash %>
<h3><%= @heading -%></h3>
<table>
@ -12,14 +12,14 @@
<td><label for="user_login"><%= t('users.desired_login') %>:</label></td>
<td> <%= text_field "user", "login", :size => 20 %></td>
</tr>
<tr>
<tr>
<td><label for="user_password"><%= t('users.choose_password') %>:</label></td>
<td><%= password_field "user", "password", :size => 20 %></td>
</tr>
<tr>
<td><label for="user_password_confirmation"><%= t('users.confirm_password') %>:</label></td>
<td><%= password_field "user", "password_confirmation", :size => 20 %></td>
</tr>
<td><%= password_field "user", "password", :size => 20 %></td>
</tr>
<tr>
<td><label for="user_password_confirmation"><%= t('users.confirm_password') %>:</label></td>
<td><%= password_field "user", "password_confirmation", :size => 20 %></td>
</tr>
<tr>
<td></td>
<td><input type="submit" id="signup" value="<%= t('users.signup') %> &#187;" class="primary" /></td>

View file

@ -1,5 +1,5 @@
<div title="No signups" id="signupform" class="form">
<h3>No Signups</h3>
<p>You don't have permission to sign up for a new account.</p>
<p>You don't have permission to sign up for a new account.</p>
<p>Please contact the site administrator <%= mail_to "#{@admin_email}", "by email", :encode => "hex" %> to get permission.</p>
</div>