mirror of
https://github.com/TracksApp/tracks.git
synced 2025-12-18 08:10:13 +01:00
Merge pull request #1714 from TracksApp/clean-up-bad-whitespace
Cleanup tabs and trailing whitespace
This commit is contained in:
commit
9375f40b6f
84 changed files with 407 additions and 407 deletions
|
|
@ -27,9 +27,9 @@ module Todos
|
||||||
@attributes = todo_params(params)
|
@attributes = todo_params(params)
|
||||||
end
|
end
|
||||||
@attributes = {} if @attributes.nil? # make sure there is at least an empty hash
|
@attributes = {} if @attributes.nil? # make sure there is at least an empty hash
|
||||||
end
|
end
|
||||||
|
|
||||||
def filter_tags
|
def filter_tags
|
||||||
if @attributes[:tags]
|
if @attributes[:tags]
|
||||||
# for single tags, @attributed[:tags] returns a hash. For multiple tags,
|
# for single tags, @attributed[:tags] returns a hash. For multiple tags,
|
||||||
# it with return an array of hashes. Make sure it is always an array of hashes
|
# it with return an array of hashes. Make sure it is always an array of hashes
|
||||||
|
|
@ -38,13 +38,13 @@ module Todos
|
||||||
@attributes[:add_tags] = @attributes[:tags]
|
@attributes[:add_tags] = @attributes[:tags]
|
||||||
@attributes.delete :tags
|
@attributes.delete :tags
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
def filter_starred
|
def filter_starred
|
||||||
if @params[:new_todo_starred]
|
if @params[:new_todo_starred]
|
||||||
@attributes["starred"] = (@params[:new_todo_starred]||"").include? "true"
|
@attributes["starred"] = (@params[:new_todo_starred]||"").include? "true"
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
def attributes
|
def attributes
|
||||||
@attributes
|
@attributes
|
||||||
|
|
|
||||||
|
|
@ -6,7 +6,7 @@ module FeedlistHelper
|
||||||
|
|
||||||
def rss_formatted_link(options = {})
|
def rss_formatted_link(options = {})
|
||||||
image_tag = image_tag("feed-icon.png", :size => "16X16", :border => 0, :class => "rss-icon")
|
image_tag = image_tag("feed-icon.png", :size => "16X16", :border => 0, :class => "rss-icon")
|
||||||
link_to(image_tag, linkoptions('rss', options), :title => "RSS feed")
|
link_to(image_tag, linkoptions('rss', options), :title => "RSS feed")
|
||||||
end
|
end
|
||||||
|
|
||||||
def text_formatted_link(options = {})
|
def text_formatted_link(options = {})
|
||||||
|
|
|
||||||
|
|
@ -8,15 +8,15 @@
|
||||||
|
|
||||||
<%= empty_message_holder("not_done_context", @not_done_todos.empty?) %>
|
<%= 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' -%>
|
<% if @group_view_by == 'project' -%>
|
||||||
<%= show_todos_without_project(@todos_without_project, {:collapsible => false, :parent_container_type => 'context', :title_param => @context.name}) -%>
|
<%= show_todos_without_project(@todos_without_project, {:collapsible => false, :parent_container_type => 'context', :title_param => @context.name}) -%>
|
||||||
<% end -%>
|
<% 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>
|
||||||
|
|
||||||
<div id="input_box">
|
<div id="input_box">
|
||||||
|
|
|
||||||
|
|
@ -56,7 +56,7 @@
|
||||||
<ul>
|
<ul>
|
||||||
<li><%= navigation_link( t('common.contexts'), contexts_path, {:accesskey=>"c", :title=>t('layouts.navigation.contexts_title')} ) %></li>
|
<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.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>
|
<li><%= navigation_link( t('layouts.navigation.recurring_todos'), {:controller => "recurring_todos", :action => "index"}, :title => t('layouts.navigation.recurring_todos_title')) %></li>
|
||||||
</ul>
|
</ul>
|
||||||
</li>
|
</li>
|
||||||
|
|
|
||||||
|
|
@ -7,16 +7,16 @@
|
||||||
|
|
||||||
<%= form_for(@prefs) do %>
|
<%= form_for(@prefs) do %>
|
||||||
<div id="tabs">
|
<div id="tabs">
|
||||||
<ul>
|
<ul>
|
||||||
<li><a href="#tabs-1"><%= t('preferences.tabs.profile')%></a></li>
|
<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-2"><%= t('preferences.tabs.authentication')%></a></li>
|
||||||
<li><a href="#tabs-3"><%= t('preferences.tabs.date_and_time')%></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>
|
<li><a href="#tabs-4"><%= t('preferences.tabs.tracks_behavior')%></a></li>
|
||||||
</ul>
|
</ul>
|
||||||
<div id="tabs-1"><%= render :partial => 'profile'%></div>
|
<div id="tabs-1"><%= render :partial => 'profile'%></div>
|
||||||
<div id="tabs-2"><%= render :partial => 'authentication'%></div>
|
<div id="tabs-2"><%= render :partial => 'authentication'%></div>
|
||||||
<div id="tabs-3"><%= render :partial => 'date_and_time'%></div>
|
<div id="tabs-3"><%= render :partial => 'date_and_time'%></div>
|
||||||
<div id="tabs-4"><%= render :partial => 'tracks_behavior'%></div>
|
<div id="tabs-4"><%= render :partial => 'tracks_behavior'%></div>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<br/>
|
<br/>
|
||||||
|
|
|
||||||
|
|
@ -7,11 +7,11 @@
|
||||||
<p><%= t('users.select_authentication_type') %></p>
|
<p><%= t('users.select_authentication_type') %></p>
|
||||||
|
|
||||||
<%= form_tag :action => 'update_auth_type' do %>
|
<%= 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><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 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 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 %>
|
<% end %>
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -12,14 +12,14 @@
|
||||||
<td><label for="user_login"><%= t('users.desired_login') %>:</label></td>
|
<td><label for="user_login"><%= t('users.desired_login') %>:</label></td>
|
||||||
<td> <%= text_field "user", "login", :size => 20 %></td>
|
<td> <%= text_field "user", "login", :size => 20 %></td>
|
||||||
</tr>
|
</tr>
|
||||||
<tr>
|
<tr>
|
||||||
<td><label for="user_password"><%= t('users.choose_password') %>:</label></td>
|
<td><label for="user_password"><%= t('users.choose_password') %>:</label></td>
|
||||||
<td><%= password_field "user", "password", :size => 20 %></td>
|
<td><%= password_field "user", "password", :size => 20 %></td>
|
||||||
</tr>
|
</tr>
|
||||||
<tr>
|
<tr>
|
||||||
<td><label for="user_password_confirmation"><%= t('users.confirm_password') %>:</label></td>
|
<td><label for="user_password_confirmation"><%= t('users.confirm_password') %>:</label></td>
|
||||||
<td><%= password_field "user", "password_confirmation", :size => 20 %></td>
|
<td><%= password_field "user", "password_confirmation", :size => 20 %></td>
|
||||||
</tr>
|
</tr>
|
||||||
<tr>
|
<tr>
|
||||||
<td></td>
|
<td></td>
|
||||||
<td><input type="submit" id="signup" value="<%= t('users.signup') %> »" class="primary" /></td>
|
<td><input type="submit" id="signup" value="<%= t('users.signup') %> »" class="primary" /></td>
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue