diff --git a/app/views/cms/view.rhtml b/app/views/cms/view.rhtml
index 8d7a0c4..0fd9f19 100644
--- a/app/views/cms/view.rhtml
+++ b/app/views/cms/view.rhtml
@@ -2,14 +2,6 @@
<%= _('Content management') %>
-<% if @article %>
-
- <%= icon('cms') %>
- <%= link_to profile.identifier, :action => 'index' %>
- <%= @article.hierarchy.map {|item| " / " + ((item == @article) ? item.name : link_to(item.slug, :id => item.id)) } %>
-
-<% end %>
-
<% button_bar(:style => 'margin-bottom: 1em;') do %>
<% parent_id = ((@article && @article.allow_children?) ? @article : nil) %>
@@ -20,6 +12,14 @@
<%= button('upload-file', _('Upload files'), :action => 'upload_files', :parent_id => parent_id) %>
<% end %>
+<% if @article %>
+
+ <%= _('Current folder: ') %>
+ <%= link_to profile.identifier, :action => 'index' %>
+ <%= @article.hierarchy.map {|item| " / " + ((item == @article) ? item.name : link_to(item.slug, :id => item.id)) } %>
+
+<% end %>
+
<%# header %>
diff --git a/public/designs/icons/tango/ie6.css b/public/designs/icons/tango/ie6.css
index 33de6be..23028c6 100644
--- a/public/designs/icons/tango/ie6.css
+++ b/public/designs/icons/tango/ie6.css
@@ -1,5 +1,5 @@
.msie6 .icon-edit { background-image: url(ie6/Tango/16x16/apps/text-editor.gif) }
-.msie6 .icon-home { background-image: url(ie6/Tango/16x16/places/user-home.gif) }
+.msie6 .icon-home { background-image: url(ie6/Tango/16x16/actions/go-home.gif) }
.msie6 .icon-new { background-image: url(ie6/Tango/16x16/actions/filenew.gif) }
.msie6 .icon-close { background-image: url(ie6/Tango/16x16/actions/gtk-cancel.gif) }
.msie6 .icon-newfolder { background-image: url(ie6/Tango/16x16/actions/folder-new.gif) }
diff --git a/public/designs/icons/tango/style.css b/public/designs/icons/tango/style.css
index b7efdfa..cc49c63 100644
--- a/public/designs/icons/tango/style.css
+++ b/public/designs/icons/tango/style.css
@@ -1,7 +1,7 @@
@import url(ie6.css);
.icon-edit { background-image: url(Tango/16x16/apps/text-editor.png) }
-.icon-home { background-image: url(Tango/16x16/places/user-home.png) }
+.icon-home { background-image: url(Tango/16x16/actions/go-home.png) }
.icon-new { background-image: url(Tango/16x16/actions/filenew.png) }
.icon-close { background-image: url(Tango/16x16/actions/gtk-cancel.png) }
.icon-newfolder { background-image: url(Tango/16x16/actions/folder-new.png) }
diff --git a/public/stylesheets/common.css b/public/stylesheets/common.css
index f6a3dd7..3327969 100644
--- a/public/stylesheets/common.css
+++ b/public/stylesheets/common.css
@@ -272,6 +272,10 @@ td.selected {
font-style: italic;
}
+td .button {
+ background-color: transparent;
+}
+
/* for fields with auto-completion */
div.auto-complete {
display: block;
diff --git a/public/stylesheets/controller_cms.css b/public/stylesheets/controller_cms.css
index 6cb4ac5..f0929fe 100644
--- a/public/stylesheets/controller_cms.css
+++ b/public/stylesheets/controller_cms.css
@@ -21,12 +21,11 @@
}
#article-full-path {
- border: 1px solid gray;
margin: 0px;
- font-size: 120%;
overflow: auto;
padding: 2px;
- background: #abc;
+ background: #eeeeec;
+ border: 1px solid #d3d7cf;
}
#article-controls {
--
libgit2 0.21.2