Commit 8ddadfe7e57a8e476aabda8631bfb98b796c24a1
1 parent
cc0a913a
Exists in
master
and in
29 other branches
ActionItem1047: slightly better CMS
Showing
5 changed files
with
16 additions
and
13 deletions
Show diff stats
app/views/cms/view.rhtml
| @@ -2,14 +2,6 @@ | @@ -2,14 +2,6 @@ | ||
| 2 | <%= _('Content management') %> | 2 | <%= _('Content management') %> |
| 3 | </h1> | 3 | </h1> |
| 4 | 4 | ||
| 5 | -<% if @article %> | ||
| 6 | - <h1 id='article-full-path'> | ||
| 7 | - <%= icon('cms') %> | ||
| 8 | - <%= link_to profile.identifier, :action => 'index' %> | ||
| 9 | - <%= @article.hierarchy.map {|item| " / " + ((item == @article) ? item.name : link_to(item.slug, :id => item.id)) } %> | ||
| 10 | - </h1> | ||
| 11 | -<% end %> | ||
| 12 | - | ||
| 13 | <% button_bar(:style => 'margin-bottom: 1em;') do %> | 5 | <% button_bar(:style => 'margin-bottom: 1em;') do %> |
| 14 | <% parent_id = ((@article && @article.allow_children?) ? @article : nil) %> | 6 | <% parent_id = ((@article && @article.allow_children?) ? @article : nil) %> |
| 15 | 7 | ||
| @@ -20,6 +12,14 @@ | @@ -20,6 +12,14 @@ | ||
| 20 | <%= button('upload-file', _('Upload files'), :action => 'upload_files', :parent_id => parent_id) %> | 12 | <%= button('upload-file', _('Upload files'), :action => 'upload_files', :parent_id => parent_id) %> |
| 21 | <% end %> | 13 | <% end %> |
| 22 | 14 | ||
| 15 | +<% if @article %> | ||
| 16 | + <div id='article-full-path'> | ||
| 17 | + <strong><%= _('Current folder: ') %></strong> | ||
| 18 | + <%= link_to profile.identifier, :action => 'index' %> | ||
| 19 | + <%= @article.hierarchy.map {|item| " / " + ((item == @article) ? item.name : link_to(item.slug, :id => item.id)) } %> | ||
| 20 | + </div> | ||
| 21 | +<% end %> | ||
| 22 | + | ||
| 23 | <table class='cms-articles'> | 23 | <table class='cms-articles'> |
| 24 | 24 | ||
| 25 | <%# header %> | 25 | <%# header %> |
public/designs/icons/tango/ie6.css
| 1 | .msie6 .icon-edit { background-image: url(ie6/Tango/16x16/apps/text-editor.gif) } | 1 | .msie6 .icon-edit { background-image: url(ie6/Tango/16x16/apps/text-editor.gif) } |
| 2 | -.msie6 .icon-home { background-image: url(ie6/Tango/16x16/places/user-home.gif) } | 2 | +.msie6 .icon-home { background-image: url(ie6/Tango/16x16/actions/go-home.gif) } |
| 3 | .msie6 .icon-new { background-image: url(ie6/Tango/16x16/actions/filenew.gif) } | 3 | .msie6 .icon-new { background-image: url(ie6/Tango/16x16/actions/filenew.gif) } |
| 4 | .msie6 .icon-close { background-image: url(ie6/Tango/16x16/actions/gtk-cancel.gif) } | 4 | .msie6 .icon-close { background-image: url(ie6/Tango/16x16/actions/gtk-cancel.gif) } |
| 5 | .msie6 .icon-newfolder { background-image: url(ie6/Tango/16x16/actions/folder-new.gif) } | 5 | .msie6 .icon-newfolder { background-image: url(ie6/Tango/16x16/actions/folder-new.gif) } |
public/designs/icons/tango/style.css
| 1 | @import url(ie6.css); | 1 | @import url(ie6.css); |
| 2 | 2 | ||
| 3 | .icon-edit { background-image: url(Tango/16x16/apps/text-editor.png) } | 3 | .icon-edit { background-image: url(Tango/16x16/apps/text-editor.png) } |
| 4 | -.icon-home { background-image: url(Tango/16x16/places/user-home.png) } | 4 | +.icon-home { background-image: url(Tango/16x16/actions/go-home.png) } |
| 5 | .icon-new { background-image: url(Tango/16x16/actions/filenew.png) } | 5 | .icon-new { background-image: url(Tango/16x16/actions/filenew.png) } |
| 6 | .icon-close { background-image: url(Tango/16x16/actions/gtk-cancel.png) } | 6 | .icon-close { background-image: url(Tango/16x16/actions/gtk-cancel.png) } |
| 7 | .icon-newfolder { background-image: url(Tango/16x16/actions/folder-new.png) } | 7 | .icon-newfolder { background-image: url(Tango/16x16/actions/folder-new.png) } |
public/stylesheets/common.css
| @@ -272,6 +272,10 @@ td.selected { | @@ -272,6 +272,10 @@ td.selected { | ||
| 272 | font-style: italic; | 272 | font-style: italic; |
| 273 | } | 273 | } |
| 274 | 274 | ||
| 275 | +td .button { | ||
| 276 | + background-color: transparent; | ||
| 277 | +} | ||
| 278 | + | ||
| 275 | /* for fields with auto-completion */ | 279 | /* for fields with auto-completion */ |
| 276 | div.auto-complete { | 280 | div.auto-complete { |
| 277 | display: block; | 281 | display: block; |
public/stylesheets/controller_cms.css
| @@ -21,12 +21,11 @@ | @@ -21,12 +21,11 @@ | ||
| 21 | } | 21 | } |
| 22 | 22 | ||
| 23 | #article-full-path { | 23 | #article-full-path { |
| 24 | - border: 1px solid gray; | ||
| 25 | margin: 0px; | 24 | margin: 0px; |
| 26 | - font-size: 120%; | ||
| 27 | overflow: auto; | 25 | overflow: auto; |
| 28 | padding: 2px; | 26 | padding: 2px; |
| 29 | - background: #abc; | 27 | + background: #eeeeec; |
| 28 | + border: 1px solid #d3d7cf; | ||
| 30 | } | 29 | } |
| 31 | 30 | ||
| 32 | #article-controls { | 31 | #article-controls { |