introduce legacy headings

This will add legacy headings to pages which cannot use the new toolbar (yet)
These are mostly wiki pages which use more complicated menus with sub-
menus. These are currently not supported by the new toolbar
(and will not be until 4.1.1).

Signed-off-by: Florian Kraft <f.kraft@finn.de>
pull/3000/head
Florian Kraft 10 years ago
parent 520a3c30aa
commit 6dc12cfb35
  1. 48
      app/assets/stylesheets/_misc_legacy.sass
  2. 7
      app/assets/stylesheets/layout/_work_package.sass
  3. 2
      app/views/wiki/annotate.html.erb
  4. 2
      app/views/wiki/date_index.html.erb
  5. 2
      app/views/wiki/destroy.html.erb
  6. 2
      app/views/wiki/diff.html.erb
  7. 2
      app/views/wiki/edit.html.erb
  8. 2
      app/views/wiki/edit_parent_page.html.erb
  9. 2
      app/views/wiki/history.html.erb
  10. 2
      app/views/wiki/index.html.erb
  11. 2
      app/views/wiki/new.html.erb
  12. 2
      app/views/wiki/rename.html.erb
  13. 2
      app/views/work_packages/show.html.erb

@ -26,12 +26,13 @@
// See doc/COPYRIGHT.rdoc for more details. // See doc/COPYRIGHT.rdoc for more details.
//++ //++
/*
IMPORTANT!
This is a "junk-drawer" containing CSS rule sets that could not be easily // IMPORTANT!
placed elsewhere. Pleade DO NOT add to this file. Instead MOVE, refactor or
REMOVE with ruthlessness. // This is a "junk-drawer" containing CSS rule sets that could not be easily
// placed elsewhere. Pleade DO NOT add to this file. Instead MOVE, refactor or
// REMOVE with ruthlessness.
#watchers #watchers
ul ul
@ -292,7 +293,7 @@ p.other-formats
.other-formats span + span:before .other-formats span + span:before
content: "| " content: "| "
/* Project members tab /* Project members tab */
div#tab-content-members div#tab-content-members
.user.status_registered, label.status_registered .user.status_registered, label.status_registered
@ -424,7 +425,7 @@ ul.projects
top: 7px top: 7px
right: 14px right: 14px
/* file table hovers /* file table hovers */
a.has-thumb a.has-thumb
img img
@ -467,7 +468,7 @@ form#issue-list
max-height: 200px max-height: 200px
overflow: hidden overflow: hidden
/* roadmap breathing /* roadmap breathing */
#roadmap h3 #roadmap h3
margin: 21px 0 12px margin: 21px 0 12px
@ -481,7 +482,7 @@ ul.projects div.root a.project
div.issue div#relations div.issue div#relations
margin-top: 25px margin-top: 25px
/* all kinds of wonderful tweaks /* all kinds of wonderful tweaks*/
.question pre .question pre
color: #111 color: #111
@ -509,12 +510,12 @@ div.issue hr
tr.time-entry tr.time-entry
white-space: normal white-space: normal
/* comments /* comments */
.wiki ol li .wiki ol li
list-style: decimal inside list-style: decimal inside
/* scm /* scm */
#content table .changeset td.id a:hover #content table .changeset td.id a:hover
text-decoration: underline text-decoration: underline
@ -522,12 +523,12 @@ tr.time-entry
#content table.files .opt-desc #content table.files .opt-desc
width: 45% width: 45%
/* member settings [pc] /* member settings [pc] */
select#member_role_id select#member_role_id
width: 75px width: 75px
/* fix for thumbnail jankiness /* fix for thumbnail jankiness */
a.has-thumb a.has-thumb
&.active &.active
@ -535,7 +536,7 @@ a.has-thumb
margin-left: -10px margin-left: -10px
margin-right: 0 margin-right: 0
*left: -10px *left: -10px
/* IE6 & 7 hacks /* IE6 & 7 hacks */
*margin-left: 0 *margin-left: 0
img img
z-index: 1001 z-index: 1001
@ -550,7 +551,7 @@ a.has-thumb
/* Cut of text with '...' - working on all major browsers and IE6+ /* Cut of text with '...' - working on all major browsers and IE6+
* not working for Firefox < 7 * not working for Firefox < 7 */
.ellipsis .ellipsis
white-space: nowrap white-space: nowrap
@ -627,7 +628,7 @@ strong.related-issues-heading
div.indent div.indent
padding-left: 10px padding-left: 10px
/* Menu item configuration /* Menu item configuration */
.menu-item-form .menu-item-form
p p
@ -669,12 +670,12 @@ div.indent
.required .required
color: #008BD0 color: #008BD0
/*Gannt chart fix IE 6 /*Gannt chart fix IE 6 */
.task .task
line-height: 1em line-height: 1em
/*Cost-Plugin specific styles /*Cost-Plugin specific styles */
.icon-pieces .icon-pieces
background-image: image-url("webalys/units.png") !important background-image: image-url("webalys/units.png") !important
@ -717,3 +718,14 @@ h4.comment
color: #4B4B4B color: #4B4B4B
strong strong
color: black color: black
/*
* Legacy headings to create headings which are similiar to the toolbar
* but cannot use the toolbar yet (e.g Legacy forms)
*/
.legacy-heading
// this will harmonize the headings in the old legacy form
// to be the same as if using a toolbar component
// TODO: once WP full screen create hits, remove this
padding-top: 12px
border: 0

@ -147,10 +147,3 @@
#attributes #attributes
.form--field-container .form--field-container
max-width: 400px max-width: 400px
.work-package-legacy-heading
// this will harmonize the headings in the old legacy form
// to be the same as if using a toolbar component
// TODO: once WP full screen create hits, remove this
padding-top: 12px

@ -34,7 +34,7 @@ See doc/COPYRIGHT.rdoc for more details.
:accesskey => accesskey(:edit)) %> :accesskey => accesskey(:edit)) %>
<%= link_to(l(:label_history), {:action => 'history', :id => @page}, :class => 'icon icon-wiki') %> <%= link_to(l(:label_history), {:action => 'history', :id => @page}, :class => 'icon icon-wiki') %>
<% end %> <% end %>
<h2><%= h(@page.pretty_title) %></h2> <h2 class='legacy-heading'><%= h(@page.pretty_title) %></h2>
<%= render :partial => 'layouts/action_menu_specific' %> <%= render :partial => 'layouts/action_menu_specific' %>
<p> <p>
<%= Version.model_name.human %> <%= link_to h(@annotate.content.version), :action => 'show', :id => @page, :version => @annotate.content.version %> <%= Version.model_name.human %> <%= link_to h(@annotate.content.version), :action => 'show', :id => @page, :version => @annotate.content.version %>

@ -30,7 +30,7 @@ See doc/COPYRIGHT.rdoc for more details.
<% content_for :action_menu_specific do %> <% content_for :action_menu_specific do %>
<%= watcher_link(@wiki, User.current) %> <%= watcher_link(@wiki, User.current) %>
<% end %> <% end %>
<h2><%= l(:label_index_by_date) %></h2> <h2 class="legacy-heading"><%= l(:label_index_by_date) %></h2>
<%= render :partial => 'layouts/action_menu_specific' %> <%= render :partial => 'layouts/action_menu_specific' %>
<% if @pages.empty? %> <% if @pages.empty? %>
<p class="nodata"><%= l(:label_no_data) %></p> <p class="nodata"><%= l(:label_no_data) %></p>

@ -26,7 +26,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
See doc/COPYRIGHT.rdoc for more details. See doc/COPYRIGHT.rdoc for more details.
++#%> ++#%>
<h2><%=h @page.pretty_title %></h2> <%= toolbar title: "#{h(@page.pretty_title)}" %>
<%= form_tag({}, :method => :delete) do %> <%= form_tag({}, :method => :delete) do %>
<div class="box"> <div class="box">
<p><strong><%= l(:text_wiki_page_destroy_question, :descendants => @descendants_count) %></strong></p> <p><strong><%= l(:text_wiki_page_destroy_question, :descendants => @descendants_count) %></strong></p>

@ -30,7 +30,7 @@ See doc/COPYRIGHT.rdoc for more details.
<% content_for :action_menu_specific do %> <% content_for :action_menu_specific do %>
<%= link_to(l(:label_history), {:action => 'history', :id => @page}, :class => 'icon icon-wiki') %> <%= link_to(l(:label_history), {:action => 'history', :id => @page}, :class => 'icon icon-wiki') %>
<% end %> <% end %>
<h2><%= h(@page.pretty_title) %></h2> <h2 class="legacy-heading"><%= h(@page.pretty_title) %></h2>
<%= render :partial => 'layouts/action_menu_specific' %> <%= render :partial => 'layouts/action_menu_specific' %>
<p> <p>
<%= Version.model_name.human %> <%= link_to @diff.content_from.version, :action => 'show', :id => @page, :project_id => @page.project, :version => @diff.content_from.version %>/<%= @page.content.version %> <%= Version.model_name.human %> <%= link_to @diff.content_from.version, :action => 'show', :id => @page, :project_id => @page.project, :version => @diff.content_from.version %>/<%= @page.content.version %>

@ -26,7 +26,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
See doc/COPYRIGHT.rdoc for more details. See doc/COPYRIGHT.rdoc for more details.
++#%> ++#%>
<h2><%=h @page.pretty_title %></h2> <%= toolbar title: "#{h(@page.pretty_title)}" %>
<%= labelled_tabular_form_for @content, :as => :content, :url => {:action => 'update', :id => @page}, :html => {:method => :put, :multipart => true, :id => 'wiki_form'} do |f| %> <%= labelled_tabular_form_for @content, :as => :content, :url => {:action => 'update', :id => @page}, :html => {:method => :put, :multipart => true, :id => 'wiki_form'} do |f| %>
<%= f.hidden_field :lock_version %> <%= f.hidden_field :lock_version %>
<%= error_messages_for 'content' %> <%= error_messages_for 'content' %>

@ -27,7 +27,7 @@ See doc/COPYRIGHT.rdoc for more details.
++#%> ++#%>
<h2><%= t(:button_change_parent_page) %>: <%= h(@page.title) %></h2> <%= toolbar title: "#{t(:button_change_parent_page)}: #{h(@page.title)}" %>
<%= error_messages_for 'page' %> <%= error_messages_for 'page' %>

@ -26,7 +26,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
See doc/COPYRIGHT.rdoc for more details. See doc/COPYRIGHT.rdoc for more details.
++#%> ++#%>
<h2><%= h(@page.pretty_title) %></h2> <%= toolbar title: "#{h(@page.pretty_title)}" %>
<h3><%= l(:label_history) %></h3> <h3><%= l(:label_history) %></h3>
<%= form_tag({:action => "diff"}, :method => :get) do %> <%= form_tag({:action => "diff"}, :method => :get) do %>
<table class="list wiki-page-versions"> <table class="list wiki-page-versions">

@ -37,7 +37,7 @@ See doc/COPYRIGHT.rdoc for more details.
<%= watcher_link(@wiki, User.current) %> <%= watcher_link(@wiki, User.current) %>
<% end %> <% end %>
<% html_title l(:label_wiki_toc) %> <% html_title l(:label_wiki_toc) %>
<h2><%= l(:label_index_by_title) %></h2> <h2 class="legacy-heading"><%= l(:label_index_by_title) %></h2>
<%= render :partial => 'layouts/action_menu_specific' %> <%= render :partial => 'layouts/action_menu_specific' %>
<% if @pages.empty? %> <% if @pages.empty? %>
<p class="nodata"><%= l(:label_no_data) %></p> <p class="nodata"><%= l(:label_no_data) %></p>

@ -27,7 +27,7 @@ See doc/COPYRIGHT.rdoc for more details.
++#%> ++#%>
<h2> <h2 class="legacy-heading">
<% if @page.parent %> <% if @page.parent %>
<% breadcrumb_for_page(@page.parent, l("create_new_page")) %> <% breadcrumb_for_page(@page.parent, l("create_new_page")) %>
<%= l("create_child_page_for", :title => @page.parent.pretty_title) %> <%= l("create_child_page_for", :title => @page.parent.pretty_title) %>

@ -27,7 +27,7 @@ See doc/COPYRIGHT.rdoc for more details.
++#%> ++#%>
<h2><%= l(:button_rename) %>: <%= h(@original_title) %></h2> <%= toolbar title: "#{l(:button_rename)} #{h(@original_title)}" %>
<%= error_messages_for 'page' %> <%= error_messages_for 'page' %>

@ -33,7 +33,7 @@ See doc/COPYRIGHT.rdoc for more details.
<% work_package_breadcrumb %> <% work_package_breadcrumb %>
<%= content_tag('h2', work_package.to_s, class: 'work-package-legacy-heading') %> <%= content_tag('h2', work_package.to_s, class: 'legacy-heading') %>
<%= render :partial => 'layouts/action_menu_specific' %> <%= render :partial => 'layouts/action_menu_specific' %>

Loading…
Cancel
Save