diff --git a/app/views/box_organizer/_highlights_block.rhtml b/app/views/box_organizer/_highlights_block.rhtml index 90be8b3..734f1bf 100644 --- a/app/views/box_organizer/_highlights_block.rhtml +++ b/app/views/box_organizer/_highlights_block.rhtml @@ -1,5 +1,5 @@ <%= _('Highlights') %> -
+ <% for image in @block.images do %> @@ -13,7 +13,6 @@ <% end %>
<%= _('Image') %><%= _('Address') %><%= _('Position') %><%= _('Title') %>
-
<%= link_to_function(_('New highlight'), nil, :class => 'button icon-add with-text') do |page| page.insert_html :bottom, 'highlights', content_tag('tr', diff --git a/app/views/box_organizer/edit.rhtml b/app/views/box_organizer/edit.rhtml index 61cf156..bc11bed 100644 --- a/app/views/box_organizer/edit.rhtml +++ b/app/views/box_organizer/edit.rhtml @@ -1,5 +1,5 @@ -
-

<%= _('Editing block') %>

+
+

<%= _('Editing block') %>

<% form_tag(:action => 'save', :id => @block.id) do %> diff --git a/public/javascripts/application.js b/public/javascripts/application.js index 9c271ee..3fce66e 100644 --- a/public/javascripts/application.js +++ b/public/javascripts/application.js @@ -920,11 +920,18 @@ function facet_options_toggle(id, url) { jQuery(function($) { $('.colorbox').live('click', function() { - $.fn.colorbox({ - href:$(this).attr('href'), - maxWidth: '600', - maxHeight: '550', - open:true + $.colorbox({ + href: $(this).attr('href'), + maxWidth: $(window).width()-50, + height: $(window).height()-50, + open: true, + fixed: true, + close: 'Cancel', + onComplete: function(bt) { + var opt = {}, maxH = $(window).height()-50; + if ($('#cboxLoadedContent *:first').height() > maxH) opt.height = maxH; + $.colorbox.resize(opt); + } }); return false; }); diff --git a/public/stylesheets/application.css b/public/stylesheets/application.css index e8c733d..ba382d3 100644 --- a/public/stylesheets/application.css +++ b/public/stylesheets/application.css @@ -1535,10 +1535,10 @@ a.button.disabled, input.disabled { * style for blocks ***********************************************************/ - #content .communities-block .profile-image { - float: none; - padding-left: 0px; - max-width: none; +#content .communities-block .profile-image { + float: none; + padding-left: 0px; + max-width: none; } #content .communities-block .vcard .profile_link { text-align: center; @@ -1591,30 +1591,30 @@ a.button.disabled, input.disabled { .invisible-block a.icon-button { position: relative; } -/*********************************************************** - * the handles to where you can drag the blocks - ***********************************************************/ +/************************************************ + * the handles to where you can drag the blocks * + ************************************************/ - .block-target { - margin: 5px; - height: 2px; - height: 15px; - border: 1px dashed #e0e0e0; +.block-target { + margin: 5px; + height: 2px; + height: 15px; + border: 1px dashed #e0e0e0; } .block-target-hover { background: #ffd; border: 1px solid red; height: 30px; } -/*********************************************************** - * put borders around boxes and blocks when organizing boxes - ***********************************************************/ +/************************************************************* + * put borders around boxes and blocks when organizing boxes * + *************************************************************/ - #box-organizer div.box { - border: 1px solid #ccc; - background-color: white; - background-repeat: no-repeat; - background-position: top right; +#box-organizer div.box { + border: 1px solid #ccc; + background-color: white; + background-repeat: no-repeat; + background-position: top right; } #box-organizer div.box-1 { background-image: url(../images/blocks/1.png); @@ -1648,6 +1648,24 @@ a.button.disabled, input.disabled { margin-top: 1em; text-align: center; } + +/**************************************** + * Block options editor floating window * + ****************************************/ + +#cboxLoadedContent { + background: #FFF; + box-shadow: 0 0 15px #888 inset; + border-radius: 5px; + border: 1px solid #777; + border-left: none; + border-right: none; +} + +.block-config-options { + padding: 0px 30px; +} + /* ==> blocks/tags-block.css <<= */ .tags-block { @@ -5628,12 +5646,6 @@ li.profile-activity-item.upload_image .activity-gallery-images-count-1 img { /* Captcha */ -/* Colorbox */ - -#cboxClose { - display: none !important; -} - /* Signup interface {{{ */ #url-check { -- libgit2 0.21.2