Andreas/tracks
1
0
Fork 0
mirror of https://github.com/TracksApp/tracks.git synced 2026-03-03 11:30:15 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch '2.3_branch'

Browse source 
This brings the master branch up to date with the 2.3 release branch
This commit is contained in:
Matt Rogers 2015-08-07 20:27:14 -04:00
commit f393afb69f
27 changed files with 111 additions and 84 deletions
Download patch file Download diff file Expand all files Collapse all files

11
app/views/projects/_new_project_form.html.erb
View file

@ -1,4 +1,3 @@
<%- reset_tab_index %>
<div id="project_new_project_container">
<div id="toggle_project_link" class="hide_form">
@ -10,19 +9,19 @@
<div id="error_status"><%= get_list_of_error_messages_for(@new_project) %></div>
<label for="project_name"><%= Project.human_attribute_name(:name) %>:</label><br />
<%= text_field 'project', 'name', "tabindex" => next_tab_index %><br />
<%= text_field 'project', 'name' %><br />
<label for="project_description"><%= Project.human_attribute_name(:description) %> (<%= t('common.optional') %>):</label><br />
<%= text_area 'project', 'description', "cols" => 30, "rows" => 4, "tabindex" => next_tab_index %><br />
<%= text_area 'project', 'description', "cols" => 30, "rows" => 4 %><br />
<% unless @contexts.empty? -%>
<label for="default_context_name"><%= Project.human_attribute_name(:default_context_name) %> (<%= t('common.optional') %>):</label><br />
<%= text_field_tag("project[default_context_name]", @new_project.default_context.name, :tabindex => next_tab_index) %>
<%= text_field_tag("project[default_context_name]", @new_project.default_context.name) %>
<br />
<% end -%>
<label for="default_tags"><%= Project.human_attribute_name(:default_tags) %> (<%= t('common.optional') %>):</label><br />
<%= text_field_tag("project[default_tags]", @new_project.default_tags, :tabindex => next_tab_index) %>
<%= text_field_tag("project[default_tags]", @new_project.default_tags) %>
<br/>
@ -34,7 +33,7 @@
</div>
</div>
<input id="go_to_project" type="checkbox" tabindex="<%= next_tab_index%>" name="go_to_project"/><label for="go_to_project"><%= t('projects.to_new_project_page') %></label><br />
<input id="go_to_project" type="checkbox" name="go_to_project"/><label for="go_to_project"><%= t('projects.to_new_project_page') %></label><br />
<% end -%>
</div>

12
app/views/projects/_project_form.html.erb
View file

@ -11,28 +11,28 @@ project = project_form
<%= source_view_tag( @source_view ) -%>
<label for="project_name">Name:</label><br/>
<%= text_field :project, 'name', :class => 'project-name', :tabindex => next_tab_index %><br/>
<%= text_field :project, 'name', :class => 'project-name' %><br/>
<label for="project_description">Description (optional):</label><br/>
<%= text_area :project, 'description', "cols" => 30, "rows" => 4, :class => 'project-description', :tabindex => next_tab_index %><br/>
<%= text_area :project, 'description', "cols" => 30, "rows" => 4, :class => 'project-description' %><br/>
<label for="project_done">Project status:</label><br/>
<% ['active', 'hidden', 'completed'].each do | state | %>
<%= radio_button(:project, 'state', state, {:tabindex => next_tab_index}) %> <%= state.titlecase %>
<%= radio_button(:project, 'state', state) %> <%= state.titlecase %>
<% end %><br/>
<label for="project[default_context_name]">Default Context</label><br/>
<%= text_field_tag("project[default_context_name]", project.default_context.name, {:tabindex=>next_tab_index,:size=> 25}) %>
<%= text_field_tag("project[default_context_name]", project.default_context.name, {:size=> 25}) %>
<br/>
<label for="project[default_tags]">Default Tags</label><br/>
<%= text_field_tag("project[default_tags]", project.default_tags, {:tabindex=>next_tab_index,:size=> 25}) %>
<%= text_field_tag("project[default_tags]", project.default_tags, {:size=> 25}) %>
<br/>
<input type="hidden" name="wants_render" value="true" />
<div class="submit_box">
<div class="widgets" id="<%= dom_id(project, 'widgets') %>">
<button type="submit" class="positive" id="<%= dom_id(project, 'submit') %>" tabindex="<%=next_tab_index%>">
<button type="submit" class="positive" id="<%= dom_id(project, 'submit') %>">
<%=image_tag("accept.png", :alt => "") %>
Update
</button>

2
app/views/projects/update.js.erb
View file

@ -33,7 +33,7 @@ var <%=object_name%> = {
update_project_page: function() {
<%=object_name%>.remove_project_edit_form();
<%=object_name%>.update_and_show_project_settings();
TracksForm.set_project_name("<%= escape_javascript(@project.name)%>");
TracksForm.set_project_name_and_default_project_name("<%= escape_javascript(@project.name)%>");
$("h2 span#project_name").html("<%= escape_javascript(@project.name)%>");
<% if @project.default_context %>
TracksForm.set_context_name_and_default_context_name("<%= escape_javascript(@project.default_context.name)%>");

2
app/views/projects/update_project_name.js.erb
View file

@ -1,4 +1,4 @@
<% if @saved -%>
TracksPages.page_inform('<%=t('projects.status_project_name_changed')%>');
TracksForm.set_project_name("<%= escape_javascript(@project.name)%>");
TracksForm.set_project_name_and_default_project_name("<%= escape_javascript(@project.name)%>");
<% end %>