Download as
Browse Code »

Commit 8ddadfe7e57a8e476aabda8631bfb98b796c24a1

Authored by Antonio Terceiro
1 parent cc0a913a
Exists in master and in 29 other branches add_member_task_reject_details, admin_visible_profile, article-list-template, community_notifications, contact_admin_translation, event_fixes, fix_comments_pagination, fix_rails4_organization_ratings, fix_sign_up_form, follow_step_fix, forum_topic_creation, mirror_block_improvements, multi_env_on_remote_user, new_security, noosfero_spb_ci, organization_ratings_improvements, organization_ratings_link_to_profile_stable-spb-1.3, organization_ratings_translations_fix, profile_api_improvements, ratings_minor_fixes, remote_user_fix, send_email_to_admins, stable-spb-1.3, stable-spb-1.3-fixes, stable-spb-1.4, stable-spb-1.5, suggest_rejected_value, web_steps_improvements, xss_terminate_custom_options

ActionItem1047: slightly better CMS

Showing 5 changed files with 16 additions and 13 deletions   Show diff stats
app/views/cms/view.rhtml
  Diff comments   View file @8ddadfe
... ... @@ -2,14 +2,6 @@
2 2 <%= _('Content management') %>
3 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 5 <% button_bar(:style => 'margin-bottom: 1em;') do %>
14 6 <% parent_id = ((@article && @article.allow_children?) ? @article : nil) %>
15 7  
... ... @@ -20,6 +12,14 @@
20 12 <%= button('upload-file', _('Upload files'), :action => 'upload_files', :parent_id => parent_id) %>
21 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 23 <table class='cms-articles'>
24 24  
25 25 <%# header %>
... ...
public/designs/icons/tango/ie6.css
  Diff comments   View file @8ddadfe
1 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 3 .msie6 .icon-new { background-image: url(ie6/Tango/16x16/actions/filenew.gif) }
4 4 .msie6 .icon-close { background-image: url(ie6/Tango/16x16/actions/gtk-cancel.gif) }
5 5 .msie6 .icon-newfolder { background-image: url(ie6/Tango/16x16/actions/folder-new.gif) }
... ...
public/designs/icons/tango/style.css
  Diff comments   View file @8ddadfe
1 1 @import url(ie6.css);
2 2  
3 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 5 .icon-new { background-image: url(Tango/16x16/actions/filenew.png) }
6 6 .icon-close { background-image: url(Tango/16x16/actions/gtk-cancel.png) }
7 7 .icon-newfolder { background-image: url(Tango/16x16/actions/folder-new.png) }
... ...
public/stylesheets/common.css
  Diff comments   View file @8ddadfe
... ... @@ -272,6 +272,10 @@ td.selected {
272 272 font-style: italic;
273 273 }
274 274  
  275 +td .button {
  276 + background-color: transparent;
  277 +}
  278 +
275 279 /* for fields with auto-completion */
276 280 div.auto-complete {
277 281 display: block;
... ...
public/stylesheets/controller_cms.css
  Diff comments   View file @8ddadfe
... ... @@ -21,12 +21,11 @@
21 21 }
22 22  
23 23 #article-full-path {
24   - border: 1px solid gray;
25 24 margin: 0px;
26   - font-size: 120%;
27 25 overflow: auto;
28 26 padding: 2px;
29   - background: #abc;
  27 + background: #eeeeec;
  28 + border: 1px solid #d3d7cf;
30 29 }
31 30  
32 31 #article-controls {
... ...