Commit 4c7be69ec64bf03749b8c4b4ef29708eb361801d
1 parent
ef4b706c
Exists in
master
and in
29 other branches
ActionItem19: updating system to use new version design plugin
git-svn-id: https://svn.colivre.coop.br/svn/noosfero/trunk@918 3f533792-8f58-4932-b0fe-aaf55b0a4547
Showing
22 changed files
with
149 additions
and
299 deletions
Show diff stats
app/controllers/admin/edit_template_controller.rb
| ... | ... | @@ -2,11 +2,9 @@ class EditTemplateController < AdminController |
| 2 | 2 | |
| 3 | 3 | design_editor :holder => 'environment', :autosave => true, :block_types => :block_types |
| 4 | 4 | |
| 5 | - #FIXME This is wrong | |
| 6 | - #See the FavoriteLinksController considerations and choose the better way | |
| 7 | 5 | def block_types |
| 8 | 6 | %w[ |
| 9 | - FavoriteLinks | |
| 7 | + FavoriteLinksProfile | |
| 10 | 8 | ] |
| 11 | 9 | end |
| 12 | 10 | ... | ... |
app/controllers/application.rb
| ... | ... | @@ -51,6 +51,8 @@ class ApplicationController < ActionController::Base |
| 51 | 51 | |
| 52 | 52 | def load_profile |
| 53 | 53 | @profile = Profile.find_by_identifier(params[:profile]) unless @profile |
| 54 | +#raise "bli %s" % @profile.inspect | |
| 55 | +# @profile = Profile.find_by_identifier(params[:profile]) unless @profile | |
| 54 | 56 | render_not_found unless @profile |
| 55 | 57 | end |
| 56 | 58 | ... | ... |
app/controllers/my_profile/profile_editor_controller.rb
| ... | ... | @@ -4,14 +4,12 @@ class ProfileEditorController < MyProfileController |
| 4 | 4 | |
| 5 | 5 | helper :profile |
| 6 | 6 | |
| 7 | - | |
| 8 | - | |
| 9 | - design_editor :holder => 'profile', :autosave => true, :block_types => :block_types | |
| 7 | + design_editor :holder => 'profile',:autosave => true, :block_types => :block_types | |
| 10 | 8 | |
| 11 | 9 | |
| 12 | 10 | def block_types |
| 13 | 11 | %w[ |
| 14 | - FavouriteLinks | |
| 12 | + FavoriteLinksProfile | |
| 15 | 13 | ] |
| 16 | 14 | end |
| 17 | 15 | ... | ... |
app/design_blocks/favorite_links_profile/controllers/favorite_links_profile_controller.rb
0 → 100644
app/design_blocks/favorite_links_profile/models/favorite_links_profile.rb
0 → 100644
app/design_blocks/favourite_links/controllers/favourite_links_controller.rb
| ... | ... | @@ -1,73 +0,0 @@ |
| 1 | -class FavouriteLinksController < ApplicationController | |
| 2 | - | |
| 3 | - | |
| 4 | - # The methods above are specific for noosfero application. I think | |
| 5 | - # this it not the correct way to get this method. | |
| 6 | - # | |
| 7 | - # We can create a method in the app/controllers/profile_admin folder | |
| 8 | - # the inherit this method and adds only the two lines above. | |
| 9 | - # | |
| 10 | - # With this way we can reuse this block on many others case and each case | |
| 11 | - # we follow the same way. | |
| 12 | - # | |
| 13 | - # Specific for app | |
| 14 | - needs_profile | |
| 15 | - design :holder => 'profile' | |
| 16 | - # End specific for app | |
| 17 | - | |
| 18 | - | |
| 19 | - acts_as_design_block | |
| 20 | - | |
| 21 | - CONTROL_ACTION_OPTIONS = { | |
| 22 | - 'manage_links' => _('Manage Links'), | |
| 23 | - 'edit' => _('Edit'), | |
| 24 | - } | |
| 25 | - | |
| 26 | - def index | |
| 27 | - get_favourite_links | |
| 28 | - design_render | |
| 29 | - end | |
| 30 | - | |
| 31 | - def edit | |
| 32 | - design_render_on_edit | |
| 33 | - end | |
| 34 | - | |
| 35 | - def save | |
| 36 | - if @design_block.update_attributes(params[:design_block]) | |
| 37 | - get_favourite_links | |
| 38 | - design_render_on_edit :action => 'manage_links' | |
| 39 | - else | |
| 40 | - design_render_on_edit :nothing => true | |
| 41 | - end | |
| 42 | - end | |
| 43 | - | |
| 44 | - def manage_links | |
| 45 | - get_favourite_links | |
| 46 | - design_render_on_edit | |
| 47 | - end | |
| 48 | - | |
| 49 | - def add_link | |
| 50 | - design_render_on_edit | |
| 51 | - end | |
| 52 | - | |
| 53 | - def remove_link | |
| 54 | - @design_block.delete_link(params[:link]) | |
| 55 | - get_favourite_links | |
| 56 | - design_render_on_edit :action => 'manage_links' | |
| 57 | - end | |
| 58 | - | |
| 59 | - def get_favourite_links | |
| 60 | - favourite_links = @design_block.favourite_links | |
| 61 | - @favourite_links_pages, @favourite_links = paginate_by_collection favourite_links | |
| 62 | - end | |
| 63 | - | |
| 64 | - def paginate_by_collection(collection, options = {}) | |
| 65 | - page = params[:page].blank? ? 1 : params[:page].to_i | |
| 66 | - items_per_page = @design_block.limit_number | |
| 67 | - offset = (page - 1) * items_per_page | |
| 68 | - link_pages = Paginator.new(self, collection.size, items_per_page, page) | |
| 69 | - collection = collection[offset..(offset + items_per_page - 1)] | |
| 70 | - return link_pages, collection | |
| 71 | - end | |
| 72 | - | |
| 73 | -end |
app/design_blocks/favourite_links/models/favourite_links.rb
| ... | ... | @@ -1,37 +0,0 @@ |
| 1 | -class FavouriteLinks < Design::Block | |
| 2 | - | |
| 3 | - def self.description | |
| 4 | - _('Favourite Links') | |
| 5 | - end | |
| 6 | - | |
| 7 | - def limit_number= value | |
| 8 | - self.settings[:limit_number] = value.to_i | |
| 9 | - end | |
| 10 | - | |
| 11 | - def limit_number | |
| 12 | - self.settings[:limit_number] || 5 | |
| 13 | - end | |
| 14 | - | |
| 15 | - def favourite_links_limited | |
| 16 | - self.favourite_links.first(self.limit_number) | |
| 17 | - end | |
| 18 | - | |
| 19 | - def favourite_links | |
| 20 | - self.settings[:favourite_links] ||= [] | |
| 21 | - end | |
| 22 | - | |
| 23 | - def delete_link link | |
| 24 | - self.settings[:favourite_links].reject!{ |item| item == link } | |
| 25 | - self.save | |
| 26 | - end | |
| 27 | - | |
| 28 | - def favourite_link | |
| 29 | - nil | |
| 30 | - end | |
| 31 | - | |
| 32 | - def favourite_link= link | |
| 33 | - self.favourite_links.push(link) | |
| 34 | - self.favourite_links.uniq! | |
| 35 | - end | |
| 36 | - | |
| 37 | -end |
app/design_blocks/favourite_links/views/add_link.rhtml
| ... | ... | @@ -1,13 +0,0 @@ |
| 1 | -<h2> <%= _('Editing Favourite Links') %> </h2> | |
| 2 | - | |
| 3 | -<% design_form_remote_tag( :url => {:action => 'save'}) do %> | |
| 4 | - | |
| 5 | - <p> | |
| 6 | - <label for="design_block_title"> <%= _("Title") %> </label> | |
| 7 | - <%= text_field 'design_block', 'favourite_link'%> | |
| 8 | - </p> | |
| 9 | - | |
| 10 | - <%= submit_tag _('Save') %> | |
| 11 | - | |
| 12 | -<% end %> | |
| 13 | - |
app/design_blocks/favourite_links/views/edit.rhtml
| ... | ... | @@ -1,29 +0,0 @@ |
| 1 | - | |
| 2 | -<h2> <%= _('Editing Favourite Links') %> </h2> | |
| 3 | - | |
| 4 | - <% design_form_remote_tag( :url => {:action => 'save'}) do %> | |
| 5 | - | |
| 6 | - <p> | |
| 7 | - <label for="design_block_title"> <%= _("Title") %> </label> | |
| 8 | - <%= text_field 'design_block', 'title'%> | |
| 9 | - </p> | |
| 10 | - | |
| 11 | - <p> | |
| 12 | - <label for="design_block_display_header"> <%= _("Display header?") %> </label> | |
| 13 | - <%= check_box 'design_block', 'display_header', {}, 'true', 'false' %> | |
| 14 | - </p> | |
| 15 | - | |
| 16 | - <p> | |
| 17 | - <label for="design_block_display_title"> <%= _("Display title?") %> </label> | |
| 18 | - <%= check_box 'design_block', 'display_title', {}, 'true', 'false' %> | |
| 19 | - </p> | |
| 20 | - | |
| 21 | - <p> | |
| 22 | - <label for="design_block_limit_number"> <%= _("Max number of links") %> </label> | |
| 23 | - <%= text_field 'design_block', 'limit_number'%> | |
| 24 | - </p> | |
| 25 | - | |
| 26 | - <%= submit_tag _('Save') %> | |
| 27 | - | |
| 28 | -<% end %> | |
| 29 | - |
app/design_blocks/favourite_links/views/index.rhtml
| ... | ... | @@ -1,16 +0,0 @@ |
| 1 | - | |
| 2 | -<% if @favourite_links_pages.current.previous%> | |
| 3 | - <%= design_link_to_remote(_('Previous'), :url => {:action => 'index', :page => @favourite_links_pages.current.previous}) %> | |
| 4 | -<% end %> | |
| 5 | -<% if @favourite_links_pages.current.next %> | |
| 6 | - <%= design_link_to_remote(_('Next'), :url => {:action => 'index', :page => @favourite_links_pages.current.next}) %> | |
| 7 | -<% end %> | |
| 8 | - | |
| 9 | -<% @favourite_links.each do |link| %> | |
| 10 | - <ul> | |
| 11 | - <li> | |
| 12 | - <%= link_to link, link, :popup => true %> | |
| 13 | - </li> | |
| 14 | - </ul> | |
| 15 | -<% end %> | |
| 16 | - |
app/design_blocks/favourite_links/views/manage_links.rhtml
| ... | ... | @@ -1,21 +0,0 @@ |
| 1 | - | |
| 2 | -<h2> | |
| 3 | - <%= _('Favourite Links') %> | |
| 4 | - <%= design_link_to_remote(_('Add Link'), :url => {:action => 'add_link'} )%> | |
| 5 | - | |
| 6 | -</h2> | |
| 7 | -<% if @favourite_links_pages.current.previous%> | |
| 8 | - <%= design_link_to_remote(_('Previous'), :url => {:action => 'manage_links', :page => @favourite_links_pages.current.previous}) %> | |
| 9 | -<% end %> | |
| 10 | -<% if @favourite_links_pages.current.next %> | |
| 11 | - <%= design_link_to_remote(_('Next'), :url => {:action => 'manage_links', :page => @favourite_links_pages.current.next}) %> | |
| 12 | -<% end %> | |
| 13 | - | |
| 14 | -<% @favourite_links.each do |link| %> | |
| 15 | - <ul> | |
| 16 | - <li> | |
| 17 | - <%= link_to link, link, :popup => true %> | |
| 18 | - <%= design_link_to_remote content_tag(:span,_('Remove')), :url => {:action => 'remove_link', :link => link } %> | |
| 19 | - </li> | |
| 20 | - </ul> | |
| 21 | -<% end %> |
config/routes.rb
| ... | ... | @@ -37,7 +37,9 @@ ActionController::Routing::Routes.draw do |map| |
| 37 | 37 | map.category 'cat/*path', :controller => 'category', :action => 'view' |
| 38 | 38 | |
| 39 | 39 | ## controllers for blocks |
| 40 | - map.controllers 'block/:controller/:action/:id', :controller => Noosfero.pattern_for_controllers_from_design_blocks | |
| 40 | + # FIXME this path didn't works Leandro comments this line and the reference to the controller path on | |
| 41 | + # /lib/noosfero.rg file. | |
| 42 | + #map.controllers 'block/:controller/:action/:id', :controller => Noosfero.pattern_for_controllers_from_design_blocks | |
| 41 | 43 | |
| 42 | 44 | ###################################################### |
| 43 | 45 | ## Controllers that are profile-specific (for profile admins ) | ... | ... |
lib/noosfero.rb
| ... | ... | @@ -9,18 +9,21 @@ module Noosfero |
| 9 | 9 | Regexp.new(pattern) |
| 10 | 10 | end |
| 11 | 11 | |
| 12 | - def self.pattern_for_controllers_from_design_blocks | |
| 13 | - items = Dir.glob(File.join(RAILS_ROOT, 'app', 'design_blocks', '*', 'controllers', '*_controller.rb')).map do |item| | |
| 14 | - item.gsub(/^.*\/([^\/]+)_controller.rb$/, '\1') | |
| 15 | - end.join('|') | |
| 16 | - Regexp.new(items.blank? ? '' : ('(' + items + ')')) | |
| 17 | - end | |
| 12 | +# FIXME This path is not working. I put a line deteach on the 'controllers_in_directory' method to meka the blocks | |
| 13 | +# works | |
| 14 | +# def self.pattern_for_controllers_from_design_blocks | |
| 15 | +# items = Dir.glob(File.join(RAILS_ROOT, 'app', 'design_blocks', '*', 'controllers', '*_controller.rb')).map do |item| | |
| 16 | +# item.gsub(/^.*\/([^\/]+)_controller.rb$/, '\1') | |
| 17 | +# end.join('|') | |
| 18 | +# Regexp.new(items.blank? ? '' : ('(' + items + ')')) | |
| 19 | +# end | |
| 18 | 20 | |
| 19 | 21 | private |
| 20 | 22 | |
| 21 | 23 | def self.controllers_in_directory(dir) |
| 22 | 24 | app_controller_path = Dir.glob(File.join(RAILS_ROOT, 'app', 'controllers', dir, '*_controller.rb')) |
| 23 | - app_controller_path.map do |item| | |
| 25 | + items = Dir.glob(File.join(RAILS_ROOT, 'app', 'design_blocks', '*', 'controllers', '*_controller.rb')) # FIXME line added to blocks works | |
| 26 | + (app_controller_path + items).map do |item| | |
| 24 | 27 | item.gsub(/^.*\/([^\/]+)_controller.rb$/, '\1') |
| 25 | 28 | end |
| 26 | 29 | end | ... | ... |
public/designs/templates/default/stylesheets/style.css
| ... | ... | @@ -36,24 +36,24 @@ body { |
| 36 | 36 | height: 145px; |
| 37 | 37 | } |
| 38 | 38 | |
| 39 | -#boxes { | |
| 39 | +#design_boxes { | |
| 40 | 40 | position: relative; |
| 41 | 41 | margin-left: 10px; |
| 42 | 42 | margin-right: 10px; |
| 43 | 43 | padding: 0em; |
| 44 | 44 | } |
| 45 | 45 | |
| 46 | -#box_3 { | |
| 46 | +#design_box_3 { | |
| 47 | 47 | width: 210px; |
| 48 | 48 | float: right; |
| 49 | 49 | } |
| 50 | 50 | |
| 51 | -#box_2 { | |
| 51 | +#design_box_2 { | |
| 52 | 52 | float: left; |
| 53 | 53 | width: 280px; |
| 54 | 54 | } |
| 55 | 55 | |
| 56 | -#box_1 { | |
| 56 | +#design_box_1 { | |
| 57 | 57 | margin-left: 285px; |
| 58 | 58 | margin-right: 215px; |
| 59 | 59 | } | ... | ... |
public/designs/templates/leftbar/stylesheets/style.css
| ... | ... | @@ -18,7 +18,7 @@ background: url("../images/bg_header.png") top center no-repeat; |
| 18 | 18 | height: 135px; |
| 19 | 19 | } |
| 20 | 20 | |
| 21 | -#boxes { | |
| 21 | +#design_boxes { | |
| 22 | 22 | position: relative; |
| 23 | 23 | width: 780px; |
| 24 | 24 | left: 50%; |
| ... | ... | @@ -26,12 +26,12 @@ margin-left: -390px; |
| 26 | 26 | padding-top: 1em; |
| 27 | 27 | } |
| 28 | 28 | |
| 29 | -#box_2 { | |
| 29 | +#design_box_2 { | |
| 30 | 30 | float: left; |
| 31 | 31 | width: 200px; |
| 32 | 32 | } |
| 33 | 33 | |
| 34 | -#box_1 { | |
| 34 | +#design_box_1 { | |
| 35 | 35 | margin-left: 205px; |
| 36 | 36 | } |
| 37 | 37 | ... | ... |
public/designs/templates/onecolumn/stylesheets/style.css
| ... | ... | @@ -14,14 +14,14 @@ background: url("../images/bg_bgheader.png") top left repeat-x; |
| 14 | 14 | height: 55px; |
| 15 | 15 | } |
| 16 | 16 | |
| 17 | -#boxes { | |
| 17 | +#design_boxes { | |
| 18 | 18 | position: relative; |
| 19 | 19 | width: auto; |
| 20 | 20 | margin: 20px; |
| 21 | 21 | padding: 10px; |
| 22 | 22 | } |
| 23 | 23 | |
| 24 | -#box_1 { | |
| 24 | +#design_box_1 { | |
| 25 | 25 | } |
| 26 | 26 | |
| 27 | 27 | #spinner { | ... | ... |
public/designs/templates/rightcolumn/stylesheets/editor.css
public/designs/templates/rightcolumn/stylesheets/style.css
| ... | ... | @@ -36,19 +36,19 @@ body { |
| 36 | 36 | height: 145px; |
| 37 | 37 | } |
| 38 | 38 | |
| 39 | -#boxes { | |
| 39 | +#design_boxes { | |
| 40 | 40 | position: relative; |
| 41 | 41 | margin-left: 10px; |
| 42 | 42 | margin-right: 10px; |
| 43 | 43 | padding: 0em; |
| 44 | 44 | } |
| 45 | 45 | |
| 46 | -#box_2 { | |
| 46 | +#design_box_2 { | |
| 47 | 47 | width: 280px; |
| 48 | 48 | float: right; |
| 49 | 49 | } |
| 50 | 50 | |
| 51 | -#box_1 { | |
| 51 | +#design_box_1 { | |
| 52 | 52 | margin-right: 285px; |
| 53 | 53 | } |
| 54 | 54 | ... | ... |
public/designs/templates/threecolumn/stylesheets/style.css
| ... | ... | @@ -16,7 +16,7 @@ background: url("../images/bg_header.png") top center no-repeat; |
| 16 | 16 | height: 135px; |
| 17 | 17 | } |
| 18 | 18 | |
| 19 | -#boxes { | |
| 19 | +#design_boxes { | |
| 20 | 20 | position: relative; |
| 21 | 21 | width: 760px; |
| 22 | 22 | left: 50%; |
| ... | ... | @@ -24,17 +24,17 @@ height: 135px; |
| 24 | 24 | padding: 0em; |
| 25 | 25 | } |
| 26 | 26 | |
| 27 | -#box_3 { | |
| 27 | +#design_box_3 { | |
| 28 | 28 | width: 200px; |
| 29 | 29 | float: right; |
| 30 | 30 | } |
| 31 | 31 | |
| 32 | -#box_2 { | |
| 32 | +#design_box_2 { | |
| 33 | 33 | float: left; |
| 34 | 34 | width: 200px; |
| 35 | 35 | } |
| 36 | 36 | |
| 37 | -#box_1 { | |
| 37 | +#design_box_1 { | |
| 38 | 38 | margin-left: 205px; |
| 39 | 39 | margin-right: 205px; |
| 40 | 40 | } | ... | ... |
public/designs/themes/default/style.css
| 1 | 1 | /* MacStyle Theme for Blocks */ |
| 2 | 2 | |
| 3 | -div.block | |
| 3 | +.design_block | |
| 4 | 4 | { |
| 5 | 5 | background: #FFFFFF; |
| 6 | 6 | border: 0px; |
| ... | ... | @@ -8,29 +8,24 @@ div.block |
| 8 | 8 | |
| 9 | 9 | /* FIXME: esta usando para flutuar */ |
| 10 | 10 | |
| 11 | -.button_block_remove { | |
| 12 | -position: absolute; | |
| 13 | -z-index: 999; | |
| 14 | -} | |
| 15 | - | |
| 16 | -ul.block_control_list | |
| 11 | +ul.design_block_control_list | |
| 17 | 12 | { |
| 18 | 13 | list-style: none; |
| 19 | 14 | margin: 0px; |
| 20 | 15 | padding: 0px; |
| 21 | 16 | } |
| 22 | 17 | |
| 23 | -div#design_editor h3.block_header { | |
| 18 | +#design_editor h3.design_block_header { | |
| 24 | 19 | cursor:move; |
| 25 | 20 | } |
| 26 | 21 | |
| 27 | -h3.block_header | |
| 22 | +.design_block h3 | |
| 28 | 23 | { |
| 29 | 24 | position: relative; |
| 30 | 25 | background: url('images/h3bg.png') repeat-x; |
| 31 | 26 | font-family: Sans-serif; |
| 32 | 27 | font-size: 15px; |
| 33 | - margin: 0px; | |
| 28 | + margin: 0px; | |
| 34 | 29 | padding: 0px; |
| 35 | 30 | overflow: hidden; |
| 36 | 31 | color: #545454; |
| ... | ... | @@ -39,7 +34,7 @@ h3.block_header |
| 39 | 34 | vertical-align: top; |
| 40 | 35 | } |
| 41 | 36 | |
| 42 | -a.button_block span { | |
| 37 | +a.design_button_block span { | |
| 43 | 38 | display: none; |
| 44 | 39 | padding: 1px; |
| 45 | 40 | color: #000; |
| ... | ... | @@ -50,44 +45,48 @@ font-weight: normal; |
| 50 | 45 | border: 1px inset #545454; |
| 51 | 46 | } |
| 52 | 47 | |
| 53 | -a.button_block:hover span { | |
| 54 | -display: inline; | |
| 48 | +a.design_button_block:hover span { | |
| 49 | +display: block; | |
| 55 | 50 | position: absolute; |
| 56 | 51 | margin-top: -20px; |
| 52 | +z-index: 100; | |
| 53 | +float: left; | |
| 57 | 54 | } |
| 58 | 55 | |
| 59 | -a.button_block { | |
| 60 | -display: block; | |
| 61 | -float: right; | |
| 62 | -position: absolute; | |
| 63 | -width: 20px; | |
| 64 | -height: 20px; | |
| 65 | -text-decoration: none; | |
| 56 | +.design_block a.design_button_block { | |
| 57 | + display: block !important; | |
| 58 | + width: 20px !important; | |
| 59 | + height: 20px !important; | |
| 60 | + margin-top: 5px !important; | |
| 61 | + margin-right: 5px !important; | |
| 62 | + float: right !important; | |
| 66 | 63 | } |
| 67 | 64 | |
| 68 | -div.block a.button_block_hide { | |
| 69 | -right: 5px; | |
| 65 | +.design_block a.button_block_hide { | |
| 70 | 66 | background:url('images/button.png') no-repeat; |
| 71 | 67 | background-position: 0px 0px; |
| 72 | 68 | } |
| 73 | 69 | |
| 74 | -div.block a:hover.button_block_hide { | |
| 70 | +.design_block a:hover.button_block_hide { | |
| 75 | 71 | background: url('images/button.png') no-repeat; |
| 76 | 72 | background-position: 0px -20px; |
| 77 | 73 | } |
| 78 | 74 | |
| 79 | -div.block a.button_block_remove { | |
| 80 | -right: 5px; | |
| 75 | +.design_block a.button_block_remove, | |
| 76 | +.design_block a.button_block_item_options, | |
| 77 | +.design_block a.button_block_options { | |
| 81 | 78 | background: url('images/button.png') no-repeat; |
| 82 | 79 | background-position:-20px 0; |
| 83 | 80 | } |
| 84 | 81 | |
| 85 | -div.block a:hover.button_block_remove { | |
| 82 | +.design_block a:hover.button_block_remove, | |
| 83 | +.design_block a.hover.button_block_item_options, | |
| 84 | +.design_block a.hover.button_block_options { | |
| 86 | 85 | background: url('images/button.png') no-repeat; |
| 87 | 86 | background-position:-20px -20px; |
| 88 | 87 | } |
| 89 | 88 | |
| 90 | -div.block_content | |
| 89 | +.design_block_content | |
| 91 | 90 | { |
| 92 | 91 | margin: 0; |
| 93 | 92 | padding: 5px 10px 9px 10px; | ... | ... |
public/designs/themes/gray/style.css
| 1 | 1 | /* Default Plain Theme for Blocks */ |
| 2 | 2 | |
| 3 | -div.block | |
| 3 | +.design_block | |
| 4 | 4 | { |
| 5 | 5 | background: #FFFFFF; |
| 6 | 6 | border: 3px solid #000000; |
| 7 | 7 | margin-bottom: 10px; |
| 8 | 8 | } |
| 9 | 9 | |
| 10 | -div.block ul | |
| 10 | +.design_block ul | |
| 11 | 11 | { |
| 12 | 12 | list-style: none; |
| 13 | 13 | margin-left: 15px; |
| 14 | 14 | } |
| 15 | 15 | |
| 16 | -div.block h3 | |
| 16 | + | |
| 17 | +.design_block h3 | |
| 17 | 18 | { |
| 18 | 19 | color: #FFFFFF; |
| 19 | 20 | background: #545454; |
| ... | ... | @@ -27,15 +28,22 @@ div.block h3 |
| 27 | 28 | padding-left: 10px; |
| 28 | 29 | } |
| 29 | 30 | |
| 30 | -div.block span { | |
| 31 | +a.design_button_block span { | |
| 31 | 32 | display: none; |
| 33 | +padding: 1px; | |
| 34 | +color: #000; | |
| 35 | +background: #dfdfdf; | |
| 36 | +font-family: Sans-serif; | |
| 37 | +font-size: 10px; | |
| 38 | +font-weight: normal; | |
| 39 | +border: 1px inset #545454; | |
| 32 | 40 | } |
| 33 | 41 | |
| 34 | -div.block a.button_block_hide:hover span { | |
| 42 | +.design_block a.desing_button_block:hover span { | |
| 35 | 43 | display: inline; |
| 36 | 44 | position: absolute; |
| 37 | -color: #dfdfdf; | |
| 38 | -background: #000000; | |
| 45 | +color: white; | |
| 46 | +background: #009900; | |
| 39 | 47 | font-family: Sans-serif; |
| 40 | 48 | font-size: 13px; |
| 41 | 49 | font-weight: normal; |
| ... | ... | @@ -44,47 +52,51 @@ padding-left: 5px; |
| 44 | 52 | padding-right: 5px; |
| 45 | 53 | } |
| 46 | 54 | |
| 47 | -div.block a.button_block { | |
| 48 | -display: block !important; | |
| 49 | -width: 10px !important; | |
| 50 | -height: 10px !important; | |
| 51 | -margin-top: 10px !important; | |
| 52 | -margin-right: 5px !important; | |
| 53 | -float: right !important; | |
| 55 | +.design_block a.design_button_block { | |
| 56 | + display: block !important; | |
| 57 | + width: 20px !important; | |
| 58 | + height: 20px !important; | |
| 59 | + margin-top: 3px !important; | |
| 60 | + margin-right: 5px !important; | |
| 61 | + float: right !important; | |
| 54 | 62 | } |
| 55 | 63 | |
| 56 | -div.block a.button_block_hide { | |
| 64 | +.design_block a.button_block_hide { | |
| 57 | 65 | border-bottom: 2px solid #dfdfdf; |
| 58 | 66 | } |
| 59 | 67 | |
| 60 | -div.block a:hover.button_block_hide { | |
| 68 | +.design_block a:hover.button_block_hide { | |
| 61 | 69 | border-bottom: 2px solid #000000; |
| 62 | 70 | } |
| 63 | 71 | |
| 64 | -div.block a.button_block_remove { | |
| 65 | -background: #dfdfdf; | |
| 72 | +.design_block a.button_block_remove, | |
| 73 | +.design_block a.button_block_item_options, | |
| 74 | +.design_block a.button_block_options { | |
| 75 | + background: #dfdfdf; | |
| 66 | 76 | } |
| 67 | 77 | |
| 68 | -div.block a:hover.button_block_remove { | |
| 69 | -background: #000000; | |
| 78 | +.design_block a:hover.button_block_remove, | |
| 79 | +.design_block a.hover.button_block_item_options, | |
| 80 | +.design_block a.hover.button_block_options { | |
| 81 | + background: #000000; | |
| 70 | 82 | } |
| 71 | 83 | |
| 72 | -div.block_content | |
| 84 | +.design_block_content | |
| 73 | 85 | { |
| 74 | 86 | padding: 5px; |
| 75 | 87 | } |
| 76 | 88 | |
| 77 | -div.block ul { | |
| 89 | +.design_block ul { | |
| 78 | 90 | padding-left: 0px; |
| 79 | 91 | margin: 0px; |
| 80 | 92 | } |
| 81 | 93 | |
| 82 | -div.block ul li a:link, | |
| 83 | -div.block ul li a:hover { | |
| 94 | +.design_block ul li a:link, | |
| 95 | +.design_block ul li a:hover { | |
| 84 | 96 | display: block; |
| 85 | 97 | color: #000; |
| 86 | 98 | } |
| 87 | -div.block ul li a:hover { | |
| 99 | +.design_block ul li a:hover { | |
| 88 | 100 | background: #ddd; |
| 89 | - color: red; | |
| 90 | 101 | } |
| 102 | + | ... | ... |
public/designs/themes/green/style.css
| 1 | 1 | /* Green Theme for Blocks */ |
| 2 | 2 | |
| 3 | -div.block | |
| 3 | +.design_block | |
| 4 | 4 | { |
| 5 | 5 | background: #FFFFFF; |
| 6 | 6 | border: 3px solid #060; |
| 7 | 7 | margin-bottom: 10px; |
| 8 | 8 | } |
| 9 | 9 | |
| 10 | -div.block ul | |
| 10 | +.design_block ul | |
| 11 | 11 | { |
| 12 | 12 | list-style: none; |
| 13 | 13 | margin-left: 15px; |
| 14 | 14 | } |
| 15 | 15 | |
| 16 | -div.block h3 | |
| 16 | +.design_block h3 | |
| 17 | 17 | { |
| 18 | 18 | color: #afa; |
| 19 | 19 | background: green; |
| ... | ... | @@ -27,11 +27,18 @@ div.block h3 |
| 27 | 27 | padding-left: 10px; |
| 28 | 28 | } |
| 29 | 29 | |
| 30 | -div.block span { | |
| 30 | +a.design_button_block span { | |
| 31 | 31 | display: none; |
| 32 | +padding: 1px; | |
| 33 | +color: #000; | |
| 34 | +background: #dfdfdf; | |
| 35 | +font-family: Sans-serif; | |
| 36 | +font-size: 10px; | |
| 37 | +font-weight: normal; | |
| 38 | +border: 1px inset #545454; | |
| 32 | 39 | } |
| 33 | 40 | |
| 34 | -div.block a.button_block_hide:hover span { | |
| 41 | +.design_block a.design_button_block:hover span { | |
| 35 | 42 | display: inline; |
| 36 | 43 | position: absolute; |
| 37 | 44 | color: white; |
| ... | ... | @@ -44,48 +51,52 @@ padding-left: 5px; |
| 44 | 51 | padding-right: 5px; |
| 45 | 52 | } |
| 46 | 53 | |
| 47 | -div.block a.button_block { | |
| 48 | -display: block; | |
| 49 | -width: 10px; | |
| 50 | -height: 10px; | |
| 51 | -margin-top: 10px; | |
| 52 | -margin-right: 5px; | |
| 53 | -float: right; | |
| 54 | -} | |
| 54 | +.design_block a.design_button_block { | |
| 55 | + display: block !important; | |
| 56 | + width: 20px !important; | |
| 57 | + height: 20px !important; | |
| 58 | + margin-top: 3px !important; | |
| 59 | + margin-right: 5px !important; | |
| 60 | + float: right !important; | |
| 61 | +} | |
| 62 | + | |
| 55 | 63 | |
| 56 | -div.block a.button_block_hide { | |
| 64 | +.design_block a.button_block_hide { | |
| 57 | 65 | border-bottom: 2px solid #dfdfdf; |
| 58 | 66 | } |
| 59 | 67 | |
| 60 | -div.block a:hover.button_block_hide { | |
| 68 | +.design_block a:hover.button_block_hide { | |
| 61 | 69 | border-bottom: 2px solid #000000; |
| 62 | 70 | } |
| 63 | 71 | |
| 64 | -div.block a.button_block_remove { | |
| 65 | -background: #dfdfdf; | |
| 72 | +.design_block a.button_block_remove, | |
| 73 | +.design_block a.button_block_item_options, | |
| 74 | +.design_block a.button_block_options { | |
| 75 | + background: #dfdfdf; | |
| 66 | 76 | } |
| 67 | 77 | |
| 68 | -div.block a:hover.button_block_remove { | |
| 69 | -background: #000000; | |
| 78 | +.design_block a:hover.button_block_remove, | |
| 79 | +.design_block a.hover.button_block_item_options, | |
| 80 | +.design_block a.hover.button_block_options { | |
| 81 | + background: #000000; | |
| 70 | 82 | } |
| 71 | 83 | |
| 72 | -div.block_content | |
| 84 | +.design_block_content | |
| 73 | 85 | { |
| 74 | 86 | padding: 5px; |
| 75 | 87 | } |
| 76 | 88 | |
| 77 | -div.block ul { | |
| 89 | +.design_block ul { | |
| 78 | 90 | padding-left: 0px; |
| 79 | 91 | margin: 0px; |
| 80 | 92 | } |
| 81 | 93 | |
| 82 | -div.block ul li a:link, | |
| 83 | -div.block ul li a:hover { | |
| 94 | +.design_block ul li a:link, | |
| 95 | +.design_block ul li a:hover { | |
| 84 | 96 | display: block; |
| 85 | 97 | color: #000; |
| 86 | 98 | } |
| 87 | -div.block ul li a:hover { | |
| 99 | +.design_block ul li a:hover { | |
| 88 | 100 | background: #ddd; |
| 89 | - color: red; | |
| 90 | 101 | } |
| 91 | 102 | ... | ... |