mirror of
https://github.com/TracksApp/tracks.git
synced 2026-02-11 09:54:21 +01:00
First-pass conversion of layouts and icons to BS3/FA
Rough around the edges.
This commit is contained in:
Dan Rice
parent
9c083b3175
commit
42e2da8653
13 changed files with 238 additions and 281 deletions
|
|
@ -1,22 +1,26 @@
|
|||
<div id="tracks-add-action-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">Add new action</h3>
|
||||
<div id="tracks-add-action-dialog" class="modal fade" tabindex="-1" role="dialog" aria-labelledby="tracks-add-action-dialog-title" 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">×</button>
|
||||
<h3 class="modal-title" id="tracks-add-action-dialog-title">Add new action</h3>
|
||||
</div>
|
||||
<div class="modal-body">
|
||||
<ul class="nav nav-tabs">
|
||||
<li class="active"><a href="#one-action" data-toggle="tab">Action</a></li>
|
||||
<li><a href="#multi-action" data-toggle="tab">Multiple actions</a></li>
|
||||
<li><a href="#repeat-action" data-toggle="tab">Repeating actions</a></li>
|
||||
</ul>
|
||||
</div>
|
||||
<div class="tab-content">
|
||||
<div class="tab-pane active" id="one-action"><%= render partial: "todos/new_todo_form", :object => Todo.new %></div>
|
||||
<div class="tab-pane" id="multi-action"><%= render partial: "todos/new_multi_todo_form", :object => Todo.new %></div>
|
||||
<div class="tab-pane" id="repeat-action"><p>WIP:repeating actions</p></div>
|
||||
</div>
|
||||
<div class="modal-footer">
|
||||
<button class="btn" data-dismiss="modal">Close</button>
|
||||
<button class="btn btn-primary">Save changes</button>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="modal-body">
|
||||
<ul class="nav nav-tabs">
|
||||
<li class="active"><a href="#one-action" data-toggle="tab">Action</a></li>
|
||||
<li><a href="#multi-action" data-toggle="tab">Multiple actions</a></li>
|
||||
<li><a href="#repeat-action" data-toggle="tab">Repeating actions</a></li>
|
||||
</ul>
|
||||
</div>
|
||||
<div class="tab-content">
|
||||
<div class="tab-pane active" id="one-action"><%= render partial: "todos/new_todo_form", :object => Todo.new %></div>
|
||||
<div class="tab-pane" id="multi-action"><%= render partial: "todos/new_multi_todo_form", :object => Todo.new %></div>
|
||||
<div class="tab-pane" id="repeat-action"><p>WIP:repeating actions</p></div>
|
||||
</div>
|
||||
<div class="modal-footer">
|
||||
<button class="btn" data-dismiss="modal" aria-hidden="true">Close</button>
|
||||
<button class="btn btn-primary">Save changes</button>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
|
|
|||
|
|
@ -1,9 +1,6 @@
|
|||
<div id="message_holder">
|
||||
<% if flash.empty? -%>
|
||||
<h4 id="flash" class="alert" style="display:none"></h4>
|
||||
<% else -%>
|
||||
<% flash.each do |key,value| -%>
|
||||
<h4 id="flash" class='alert <%= key %>'><%= value %></h4>
|
||||
<% end -%>
|
||||
<% flash.each do |key,value| -%>
|
||||
<div class='alert <%= key.to_s == 'notice' ? 'alert-success' : 'alert-danger' %> alert-dismissable'>
|
||||
<button type="button" class="close" data-dismiss="alert" aria-hidden="true">×</button>
|
||||
<%= value %>
|
||||
</div>
|
||||
<% end -%>
|
||||
</div>
|
||||
|
|
@ -1,29 +1,33 @@
|
|||
<div id="tracks-goto-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">Go to...</h3>
|
||||
</div>
|
||||
<div class="modal-body">
|
||||
<div>
|
||||
<h4>Go to project...</h4>
|
||||
<ul>
|
||||
<% current_user.projects.active.each do |project| -%>
|
||||
<%= content_tag(:li){ link_to project.name, project_path(project)} %>
|
||||
<% end -%>
|
||||
<li><%= link_to "All projects", projects_path %></li>
|
||||
</ul>
|
||||
</div>
|
||||
<div>
|
||||
<h4>Go to context...</h4>
|
||||
<ul>
|
||||
<% current_user.contexts.active.each do |context| -%>
|
||||
<%= content_tag(:li){ link_to context.name, context_path(context)} %>
|
||||
<% end -%>
|
||||
<li><%= link_to "All contexts", contexts_path %></li>
|
||||
</ul>
|
||||
</div>
|
||||
</div>
|
||||
<div class="modal-footer">
|
||||
<button class="btn" data-dismiss="modal" aria-hidden="true">Close</button>
|
||||
</div>
|
||||
</div>
|
||||
<div id="tracks-goto-dialog" class="modal fade" tabindex="-1" role="dialog" aria-labelledby="tracks-goto-dialog-title" 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">×</button>
|
||||
<h3 class="modal-title" id="tracks-goto-dialog-title">Go to...</h3>
|
||||
</div>
|
||||
<div class="modal-body">
|
||||
<div>
|
||||
<h4>Go to project...</h4>
|
||||
<ul>
|
||||
<% current_user.projects.active.each do |project| -%>
|
||||
<%= content_tag(:li){ link_to project.name, project_path(project)} %>
|
||||
<% end -%>
|
||||
<li><%= link_to "All projects", projects_path %></li>
|
||||
</ul>
|
||||
</div>
|
||||
<div>
|
||||
<h4>Go to context...</h4>
|
||||
<ul>
|
||||
<% current_user.contexts.active.each do |context| -%>
|
||||
<%= content_tag(:li){ link_to context.name, context_path(context)} %>
|
||||
<% end -%>
|
||||
<li><%= link_to "All contexts", contexts_path %></li>
|
||||
</ul>
|
||||
</div>
|
||||
</div>
|
||||
<div class="modal-footer">
|
||||
<button class="btn" data-dismiss="modal">Close</button>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
|
|
|||
|
|
@ -1,81 +1,67 @@
|
|||
<div class="navbar navbar-fluid-top navbar-inverse">
|
||||
<div class="navbar-inner">
|
||||
<div class="container-fluid">
|
||||
|
||||
<div class="btn-navbar" data-target=".nav-collapse">
|
||||
<a class="btn btn-navbar" data-target=".nav-collapse" data-toggle="collapse">
|
||||
<span class="icon-bar"></span>
|
||||
<span class="icon-bar"></span>
|
||||
<span class="icon-bar"></span>
|
||||
</a>
|
||||
<a class="btn btn-primary btn-small button-add-todo" title="Add a new action"><i class="icon-plus icon-large"></i></a>
|
||||
<a class="btn btn-primary btn-small button-goto" title="Go to..."><i class="icon-mail-forward icon-large"></i></a>
|
||||
</div>
|
||||
|
||||
<a class="brand" href="#"><span id="badge_count" class="badge_count"><%= @badge_count || @count %></span></a>
|
||||
|
||||
<div class="container-fluid nav-collapse">
|
||||
<ul class="nav">
|
||||
<li><%= menu_item("home", root_path) %></li>
|
||||
<li><%= menu_item("starred", tag_path("starred")) %></li>
|
||||
<li><%= menu_item("projects", projects_path) %></li>
|
||||
<li><%= menu_item("tickler", tickler_path) %></li>
|
||||
<li class="dropdown">
|
||||
<a href="#" class="dropdown-toggle" data-toggle="dropdown"><%= t('layouts.navigation.organize') %><b class="caret"></b></a>
|
||||
<ul class="dropdown-menu">
|
||||
<li><%= menu_item("contexts", contexts_path) %></li>
|
||||
<li><%= menu_item("notes", notes_path) %></li>
|
||||
<li><%= menu_item("review", review_path) %></li>
|
||||
<li><%= menu_item("recurring_todos", recurring_todos_path) %></li>
|
||||
</ul>
|
||||
</li>
|
||||
<li class="dropdown" id="menu_view">
|
||||
<a href="#" class="dropdown-toggle" data-toggle="dropdown" id="menu_view_link"><%= t('layouts.navigation.view') %><b class="caret"></b></a>
|
||||
<ul class="dropdown-menu">
|
||||
<li><%= menu_item("calendar", calendar_path) %></li>
|
||||
<li><%= menu_item("completed_tasks", done_overview_path) %></li>
|
||||
<li><%= menu_item("feeds", feeds_path) %></li>
|
||||
<li><%= menu_item("stats", stats_path) %></li>
|
||||
<li class="divider"></li>
|
||||
<li><%= menu_item("toggle_contexts", "#", {:id => "toggle-contexts-nav"}) %></li>
|
||||
<li><%= menu_item("toggle_notes", "#", {:id => "toggle-notes-nav"}) %></li>
|
||||
<li><%= group_view_by_menu_entry %></li>
|
||||
</ul>
|
||||
</li>
|
||||
<li class="dropdown">
|
||||
<a href="#" class="dropdown-toggle" data-toggle="dropdown"><%= t('layouts.navigation.admin') %><b class="caret"></b></a>
|
||||
<ul class="dropdown-menu">
|
||||
<li><%= menu_item("preferences", preferences_path) %></li>
|
||||
<li><%= menu_item("export", data_path) %></li>
|
||||
<% if current_user.is_admin? -%>
|
||||
<li><%= menu_item("manage_users", users_path) %></li>
|
||||
<% end -%>
|
||||
</ul>
|
||||
</li>
|
||||
<li class="dropdown">
|
||||
<a href="#" class="dropdown-toggle" data-toggle="dropdown"><%= t('layouts.navigation.help') %><b class="caret"></b></a>
|
||||
<ul class="dropdown-menu">
|
||||
<li><%= menu_item("keyboard_shortcuts", "#",{:id => "menu-keyboard-shotcuts"}) %></li>
|
||||
<li><%= menu_item("integrations", integrations_path) %></li>
|
||||
<li><%= menu_item("api_docs", rest_api_docs_path) %></li>
|
||||
</ul>
|
||||
</li>
|
||||
</ul>
|
||||
<ul class="nav pull-right">
|
||||
<li>
|
||||
<div class="btn-toolbar">
|
||||
<a class="btn btn-primary btn-small button-add-todo" title="Add a new action" data-keybinding="a"><i class="icon-plus icon-large"></i></a>
|
||||
<a class="btn btn-primary btn-small button-goto" title="Go to..." data-keybinding="G"><i class="icon-mail-forward icon-large"></i></a>
|
||||
</div>
|
||||
</li>
|
||||
<li>
|
||||
<form class="navbar-search pull-right">
|
||||
<input type="text" class="search-query" placeholder="Search">
|
||||
</form>
|
||||
</li>
|
||||
<li><%= link_to("<i class='icon-signout'></i>".html_safe, logout_path, title: "#{t('common.logout')} (#{current_user.display_name})") %></li>
|
||||
</ul>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="navbar navbar-static-top navbar-inverse" role="navigation">
|
||||
<div class="container-fluid">
|
||||
<div class="navbar-header">
|
||||
<button type="button" class="navbar-toggle" data-toggle="collapse" data-target=".navbar-collapse">
|
||||
<span class="sr-only">Toggle navigation</span>
|
||||
<span class="icon-bar"></span>
|
||||
<span class="icon-bar"></span>
|
||||
<span class="icon-bar"></span>
|
||||
</button>
|
||||
<a class="navbar-brand" href="#"><span id="badge_count" class="badge_count"><%= @badge_count || @count %></span></a>
|
||||
</div><%# //.navbar-header %>
|
||||
<div class="navbar-collapse collapse">
|
||||
<ul class="nav navbar-nav">
|
||||
<li><%= menu_item("home", root_path) %></li>
|
||||
<li><%= menu_item("starred", tag_path("starred")) %></li>
|
||||
<li><%= menu_item("projects", projects_path) %></li>
|
||||
<li><%= menu_item("tickler", tickler_path) %></li>
|
||||
<li class="dropdown">
|
||||
<a href="#" class="dropdown-toggle" data-toggle="dropdown"><%= t('layouts.navigation.organize') %><b class="caret"></b></a>
|
||||
<ul class="dropdown-menu">
|
||||
<li><%= menu_item("contexts", contexts_path) %></li>
|
||||
<li><%= menu_item("notes", notes_path) %></li>
|
||||
<li><%= menu_item("review", review_path) %></li>
|
||||
<li><%= menu_item("recurring_todos", recurring_todos_path) %></li>
|
||||
</ul>
|
||||
</li>
|
||||
<li class="dropdown" id="menu_view">
|
||||
<a href="#" class="dropdown-toggle" data-toggle="dropdown" id="menu_view_link"><%= t('layouts.navigation.view') %><b class="caret"></b></a>
|
||||
<ul class="dropdown-menu">
|
||||
<li><%= menu_item("calendar", calendar_path) %></li>
|
||||
<li><%= menu_item("completed_tasks", done_overview_path) %></li>
|
||||
<li><%= menu_item("feeds", feeds_path) %></li>
|
||||
<li><%= menu_item("stats", stats_path) %></li>
|
||||
<li class="divider"></li>
|
||||
<li><%= menu_item("toggle_contexts", "#", {:id => "toggle-contexts-nav"}) %></li>
|
||||
<li><%= menu_item("toggle_notes", "#", {:id => "toggle-notes-nav"}) %></li>
|
||||
<li><%= group_view_by_menu_entry %></li>
|
||||
</ul>
|
||||
</li>
|
||||
<li class="dropdown">
|
||||
<a href="#" class="dropdown-toggle" data-toggle="dropdown"><%= t('layouts.navigation.admin') %><b class="caret"></b></a>
|
||||
<ul class="dropdown-menu">
|
||||
<li><%= menu_item("preferences", preferences_path) %></li>
|
||||
<li><%= menu_item("export", data_path) %></li>
|
||||
<% if current_user.is_admin? -%>
|
||||
<li><%= menu_item("manage_users", users_path) %></li>
|
||||
<% end -%>
|
||||
</ul>
|
||||
</li>
|
||||
<li class="dropdown">
|
||||
<a href="#" class="dropdown-toggle" data-toggle="dropdown"><%= t('layouts.navigation.help') %><b class="caret"></b></a>
|
||||
<ul class="dropdown-menu">
|
||||
<li><%= menu_item("keyboard_shortcuts", "#",{:id => "menu-keyboard-shotcuts"}) %></li>
|
||||
<li><%= menu_item("integrations", integrations_path) %></li>
|
||||
<li><%= menu_item("api_docs", rest_api_docs_path) %></li>
|
||||
</ul>
|
||||
</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">
|
||||
<%= 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 %>
|
||||
</div><%# //.container %>
|
||||
</div><%# //.navbar %>
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue