Andreas/tracks
1
0
Fork 0
mirror of https://github.com/TracksApp/tracks.git synced 2026-02-09 00:54:21 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix layout and modal issues

Browse source 
These were "regressions" after the bootstrap 3 migration
This commit is contained in:
Reinier Balt 2014-06-26 13:59:06 +02:00
parent 29acdc5a9d
commit 2f13da8bff
9 changed files with 89 additions and 65 deletions
Download patch file Download diff file Expand all files Collapse all files

34
app/views/projects/_goto_item.html.erb
View file

@ -1,16 +1,22 @@
<div id="tracks-go-item-dialog" class="modal hide fade" tabindex="-1" role="dialog" aria-labelledby="myModalLabel" aria-hidden="true">
<div class="modal-header">
<button type="button" class="close" data-dismiss="modal" aria-hidden="true">×</button>
<h3 id="myModalLabel">...</h3>
</div>
<div class="modal-body">
<form class="form-search" action="/goto" method="get" data-link="/goto">
<input type="text" id="tracks-goto-item" class="input-medium search-query ajax-typeahead" placeholder="..."
data-link="/from_go_item_dialog.autocomplete" autocomplete="off">
</form>
</div>
<div class="modal-footer">
<button class="btn" data-dismiss="modal" aria-hidden="true">Close</button>
<button class="btn btn-primary">Go to project</button>
<div id="tracks-go-item-dialog" class="modal fade" tabindex="-1" role="dialog" aria-labelledby="myModalLabel" aria-hidden="true">
<div class="modal-dialog">
<div class="modal-content">
<div class="modal-header">
<button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
<h4 id="myModalLabel">...</h4>
</div>
<div class="modal-body">
<form action="/goto" method="get" data-link="/goto" role="form">
<div class="form-group">
<input type="text" id="tracks-goto-item" class="form-control input-medium search-query ajax-typeahead" placeholder="..."
data-link="/from_go_item_dialog.autocomplete" autocomplete="off">
</div>
</form>
</div>
<div class="modal-footer">
<button class="btn btn-default" data-dismiss="modal" aria-hidden="true">Close</button>
<button class="btn btn-primary">Go to project</button>
</div>
</div>
</div>
</div>

4
app/views/shared/_goto.html.erb
View file

@ -3,7 +3,7 @@
<div class="modal-content">
<div class="modal-header">
<button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
<h3 class="modal-title" id="tracks-goto-dialog-title">Go to...</h3>
<h4 class="modal-title" id="tracks-goto-dialog-title">Go to...</h4>
</div>
<div class="modal-body">
<div>
@ -26,7 +26,7 @@
</div>
</div>
<div class="modal-footer">
<button class="btn" data-dismiss="modal">Close</button>
<button class="btn btn-primary" data-dismiss="modal">Close</button>
</div>
</div>
</div>

48
app/views/shared/_keyboard_shortcuts.html.erb
View file

@ -1,35 +1,39 @@
<div id="tracks-shortcuts-dialog" class="modal hide fade" tabindex="-1" role="dialog" aria-labelledby="myModalLabel" aria-hidden="true">
<div class="modal-header">
<button type="button" class="close" data-dismiss="modal" aria-hidden="true">×</button>
<h3 id="myModalLabel">Keyboard Shortcuts</h3>
</div>
<div class="modal-body">
<div id="tracks-shortcuts-dialog" class="modal fade" tabindex="-1" role="dialog" aria-labelledby="tracks-keyboard-shortcuts" aria-hidden="true">
<div class="modal-dialog">
<div class="modal-content">
<div class="modal-header">
<button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
<h4 class="modal-title" id="tracks-keyboard-shortcuts">Keyboard Shortcuts</h4>
</div>
<div class="modal-body">
<ul>
<li><span class="badge">?</span>: Shows this help page</li>
<li><span class="badge">a</span>: add action</li>
<li><span class="badge">i</span>: show details of action or project</li>
<li><span class="badge">?</span>: Shows this help page</li>
<li><span class="badge">a</span>: add action</li>
<li><span class="badge">i</span>: show details of action or project</li>
</ul>
<p>Navigation:</p>
<ul>
<li><span class="badge">j</span> or <span class="badge">k</span>: go to previous or next item</li>
<li><span class="badge">G</span>: show list of project and contexts</li>
<li><span class="badge">g</span> then <span class="badge">h</span>: go to the home page</li>
<li><span class="badge">g</span> then <span class="badge">c</span>: go to a specific context</li>
<li><span class="badge">g</span> then <span class="badge">C</span>: go to the contexts page</li>
<li><span class="badge">g</span> then <span class="badge">p</span>: go to a specific project</li>
<li><span class="badge">g</span> then <span class="badge">P</span>: go to the projects page</li>
<li><span class="badge">j</span> or <span class="badge">k</span>: go to previous or next item</li>
<li><span class="badge">Shift-G</span>: show list of project and contexts</li>
<li><span class="badge">g</span> then <span class="badge">h</span>: go to the home page</li>
<li><span class="badge">g</span> then <span class="badge">c</span>: go to a specific context</li>
<li><span class="badge">g</span> then <span class="badge">Shift-C</span>: go to the contexts page</li>
<li><span class="badge">g</span> then <span class="badge">p</span>: go to a specific project</li>
<li><span class="badge">g</span> then <span class="badge">Shift-P</span>: go to the projects page</li>
</ul>
<p>Grouping of actions:</p>
<ul>
<li><span class="badge">v</span> then <span class="badge">p</span>: group the actions on the page by project</li>
<li><span class="badge">v</span> then <span class="badge">c</span>: group the actions on the page by context</li>
<li><span class="badge">v</span> then <span class="badge">p</span>: group the actions on the page by project</li>
<li><span class="badge">v</span> then <span class="badge">c</span>: group the actions on the page by context</li>
</ul>
<p>Handling actions:</p>
<ul>
<li><span class="badge">n</span>: Toggle the notes of the selected action</li>
<li><span class="badge">n</span>: Toggle the notes of the selected action</li>
</ul>
</div>
<div class="modal-footer">
<button type="button" class="btn btn-primary" data-dismiss="modal">Close</button>
</div>
</div>
<div class="modal-footer">
<button class="btn" data-dismiss="modal" aria-hidden="true">Close</button>
</div>
</div>
</div>

11
app/views/shared/_navbar.html.erb
View file

@ -57,9 +57,14 @@
</li>
</ul>
<form class="navbar-form navbar-right" role="form">
<a class="btn btn-primary button-add-todo" title="Add a new action"><i class="fa fa-plus fa-lg"></i></a>
<a class="btn btn-primary button-goto" title="Go to..."><i class="fa fa-share fa-lg"></i></a>
<input type="text" class="form-control search-query" placeholder="Search">
<button class="btn btn-primary btn-sm button-add-todo" title="Add a new action"><i class="fa fa-plus fa-lg"></i></button>
<button class="btn btn-primary btn-sm button-goto" title="Go to..."><i class="fa fa-share fa-lg"></i></button>
<div class="input-group">
<input type="text" class="form-control" placeholder="Search">
<span class="input-group-btn">
<button class="btn btn-default"type="button"><i class="fa fa-search"></i></button>
</span>
</div>
<%= link_to("<i class='fa fa-sign-out'></i>".html_safe, logout_path, title: "#{t('common.logout')} (#{current_user.display_name})") %>
</form>
</div><%# //.navbar-collapse %>

6
app/views/todos/_todo.html.erb
View file

@ -1,8 +1,8 @@
<% cache [todo, current_user.date.strftime("%Y%m%d"), @source_view, current_user.prefs.verbose_action_descriptors] do -%>
<div id="<%= dom_id(todo) %>" class="todo-item"
<div id="<%= dom_id(todo) %>" class="todo-item container-fluid"
data-info="<%= render partial: "todos/todo_info", locals: {todo: todo} %>">
<div class="row">
<div class="span8">
<div class="col-md-8">
<span class="todo-item-icons">
<i class="fa <%= todo.completed? ? "fa-check-square-o" : "fa-square-o" %>"></i>
<i class="fa <%= todo.starred? ? "fa-star" : "fa-star-o"%>"></i>
@ -23,7 +23,7 @@
</small></p>
</span>
</div>
<div class="span4 pull-right hidden-phone tracks-todo-badges">
<div class="col-md-4 pull-right hidden-phone tracks-todo-badges">
<%= date_span(todo) -%>
<%= tag_list(todo) %>
</div>