diff --git a/app/controllers/my_profile/profile_design_controller.rb b/app/controllers/my_profile/profile_design_controller.rb
index 791bc90..44fb7ac 100644
--- a/app/controllers/my_profile/profile_design_controller.rb
+++ b/app/controllers/my_profile/profile_design_controller.rb
@@ -5,7 +5,7 @@ class ProfileDesignController < BoxOrganizerController
protect 'edit_profile_design', :profile
def available_blocks
- blocks = [ ArticleBlock, TagsBlock, RecentDocumentsBlock, ProfileInfoBlock, LinkListBlock, MyNetworkBlock, FeedReaderBlock ]
+ blocks = [ ArticleBlock, TagsBlock, RecentDocumentsBlock, ProfileInfoBlock, LinkListBlock, MyNetworkBlock, FeedReaderBlock, ProfileImageBlock ]
# blocks exclusive for organizations
if profile.has_members?
@@ -20,7 +20,6 @@ class ProfileDesignController < BoxOrganizerController
# blocks exclusive for enterprises
if profile.enterprise?
- blocks << ProfileImageBlock
blocks << LocalizationBlock
blocks << DisabledEnterpriseMessageBlock
end
diff --git a/app/helpers/boxes_helper.rb b/app/helpers/boxes_helper.rb
index ec38ba5..c9a5b6e 100644
--- a/app/helpers/boxes_helper.rb
+++ b/app/helpers/boxes_helper.rb
@@ -190,7 +190,7 @@ module BoxesHelper
if !block.main?
buttons << icon_button(:eyes, _('Toggle block visibility'), {:action => 'toggle_visibility', :id => block.id})
- buttons << icon_button(:delete, _('Remove block'), { :action => 'remove', :id => block.id }, { :method => 'post'})
+ buttons << icon_button(:delete, _('Remove block'), { :action => 'remove', :id => block.id }, { :method => 'post', :confirm => _('Are you sure you want to remove this block?')})
end
if block.respond_to?(:help)
diff --git a/app/views/cms/media_listing.rhtml b/app/views/cms/media_listing.rhtml
index d5cb1f1..988ee4d 100644
--- a/app/views/cms/media_listing.rhtml
+++ b/app/views/cms/media_listing.rhtml
@@ -7,7 +7,7 @@
%>
<%= javascript_include_tag :defaults %>
<%= javascript_include_tag 'lowpro' %>
- <%= stylesheet_link_tag '/designs/icons/default/style.css' %>
+ <%= icon_theme_stylesheet_tag %>
<% if logged_in? && current_user.person.has_permission?('post_content', profile) %>
-
+
<% unless @page.blog? %>
<%= link_to content_tag( 'span', label_for_edit_article(@page) ),
profile.admin_url.merge({ :controller => 'cms', :action => 'edit', :id => @page.id }),
@@ -43,16 +36,17 @@
profile.admin_url.merge({ :controller => 'cms', :action => 'destroy', :id => @page }),
:class => 'button with-text icon-delete' %>
<% end %>
- <% if profile.kind_of?(Person) && !environment.enabled?('disable_cms') %>
+ <% if profile.kind_of?(Person) && !environment.enabled?('disable_cms') && !@page.folder? %>
<%= link_to content_tag( 'span', _('Spread this') ),
profile.admin_url.merge({ :controller => 'cms', :action => 'publish', :id => @page }),
:class => 'button with-text icon-spread' %>
<% end %>
- <% if @page.display_as_gallery? %>
- <%= button('upload-file', _('Upload files'), profile.admin_url.merge(:controller => 'cms', :action => 'upload_files', :parent_id => (@page.folder? ? @page : @page.parent))) %>
- <% else %>
+ <% if !@page.display_as_gallery? %>
<%= lightbox_button(:new, label_for_new_article(@page), profile.admin_url.merge(:controller => 'cms', :action => 'new', :parent_id => (@page.folder? ? @page : (@page.parent.nil? ? nil : @page.parent)))) %>
<% end %>
+ <% if @page.folder? %>
+ <%= button('upload-file', _('Upload files'), profile.admin_url.merge(:controller => 'cms', :action => 'upload_files', :parent_id => (@page.folder? ? @page : @page.parent))) %>
+ <% end %>
<% end %>
<% if profile.kind_of?(Enterprise) && @page.display_as_gallery? %>
<%= button('upload-file', _('Upload files'), :controller => 'cms', :action => 'upload_files', :parent_id => (@page.folder? ? @page : @page.parent)) %>
diff --git a/app/views/shared/user_menu.rhtml b/app/views/shared/user_menu.rhtml
index ffa661f..424f254 100644
--- a/app/views/shared/user_menu.rhtml
+++ b/app/views/shared/user_menu.rhtml
@@ -36,7 +36,7 @@
<% if user.is_admin?(environment) %>
-
<%= link_to( ''+ _('Admin'),
+ <%= link_to( ''+ _('Admin'),
{:controller => 'admin_panel' },
:id => 'link_admin_panel',
:help => _('Access the site administration panel.')
diff --git a/config/routes.rb b/config/routes.rb
index 6e1f2d9..3d0a545 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -23,6 +23,11 @@ ActionController::Routing::Routes.draw do |map|
map.connect 'images/*stuff', :controller => 'not_found', :action => 'index'
map.connect 'stylesheets/*stuff', :controller => 'not_found', :action => 'index'
+ map.connect 'designs/*stuff', :controller => 'not_found', :action => 'index'
+ map.connect 'articles/*stuff', :controller => 'not_found', :action => 'index'
+ map.connect 'javascripts/*stuff', :controller => 'not_found', :action => 'index'
+ map.connect 'thumbnails/*stuff', :controller => 'not_found', :action => 'index'
+ map.connect 'user_themes/*stuff', :controller => 'not_found', :action => 'index'
# user account controller
map.connect 'account/new_password/:code', :controller => 'account', :action => 'new_password'
diff --git a/public/designs/icons/default/style.css b/public/designs/icons/default/style.css
index 1e21502..1075724 100644
--- a/public/designs/icons/default/style.css
+++ b/public/designs/icons/default/style.css
@@ -2,6 +2,7 @@
.icon-home { background-image: url(gnome-home.png) }
.icon-new { background-image: url(new-HC.gif) }
.icon-close { background-image: url(cancel-HC.gif) }
+.icon-newfolder { background-image: url(add-HC.gif) }
.icon-open { background-image: url(folder-open.gif) }
.icon-cms { background-image: url(abiword_48.png) }
.icon-save { background-image: url(save-HC.gif) }
diff --git a/public/stylesheets/article.css b/public/stylesheets/article.css
index f5633f8..61c313d 100644
--- a/public/stylesheets/article.css
+++ b/public/stylesheets/article.css
@@ -10,10 +10,6 @@
right: -17px;
padding-right: 15px;
}
-#article-actions.hidden {
- opacity: 0.5;
- filter: alpha(opacity=50);
-}
#article-tags {
font-size: 10px;
--
libgit2 0.21.2