diff --git a/app/assets/images/Thumbs.db b/app/assets/images/Thumbs.db new file mode 100644 index 00000000..20b6d49e Binary files /dev/null and b/app/assets/images/Thumbs.db differ diff --git a/app/assets/stylesheets/banner_nav.css b/app/assets/stylesheets/banner_nav.css new file mode 100644 index 00000000..ed613576 --- /dev/null +++ b/app/assets/stylesheets/banner_nav.css @@ -0,0 +1,34 @@ +#banner_nav { + position: absolute; + z-index: 10; + bottom: 0; + margin-right: 5px; + right: 0; +} +#banner_nav>li { + float: left; + display: inline-block; + *display: inline; + +} +#banner_nav>li>a { + width: 10px; + height: 10px; + border-radius: 5px; + -webkit-border-radius: 5px; + -moz-border-radius: 5px; + background-color: #FFFFFF; + opacity: .5; + filter: alpha(opacity = 50); + margin: 0 4px 10px; + text-indent: -9999px; + box-shadow: 0 0 5px rgba(0,0,0,.7); +} +#banner_nav>li>a:hover { + opacity: 1; + filter: alpha(opacity = 100); +} +#banner_nav>li.activeSlide>a { + opacity: 1; + filter: alpha(opacity = 100); +} diff --git a/app/assets/stylesheets/inc/permission-checkbox.css.erb b/app/assets/stylesheets/inc/permission-checkbox.css.erb index 7e3f5bff..a5a50a17 100644 --- a/app/assets/stylesheets/inc/permission-checkbox.css.erb +++ b/app/assets/stylesheets/inc/permission-checkbox.css.erb @@ -10,7 +10,7 @@ } .checkbox{ padding: 5px; - margin: 0; + margin: 10px; display: inline-block; color:#777777; text-shadow: 0 1px 0px rgba(255,255,255,.4); @@ -20,7 +20,7 @@ border-style: solid; border-width: 0px 1px 1px 0; border-color: #dfdfdf; - /*background:-webkit-gradient( linear, left top, left bottom, color-stop(0.05, #ededed), color-stop(1, #dfdfdf) ); + background:-webkit-gradient( linear, left top, left bottom, color-stop(0.05, #ededed), color-stop(1, #dfdfdf) ); background:-moz-linear-gradient( center top, #ededed 5%, #dfdfdf 100% ); filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ededed', endColorstr='#dfdfdf'); -webkit-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.2), 0 1px 2px rgba(0, 0, 0, 0.05); @@ -28,7 +28,7 @@ box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.2), 0 1px 2px rgba(0, 0, 0, 0.05); border-radius: 3px; -moz-border-radius: 3px; - -webkit-border-radius: 3px;*/ + -webkit-border-radius: 3px; } .checkbox .check-icon { display: none; @@ -79,4 +79,7 @@ img.member-img { } .popover-content p { font-size: 12px; +} +.preview_trigger { + margin: 5px 10px 0 0; } \ No newline at end of file diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb index e72b2b82..74d3e662 100644 --- a/app/helpers/application_helper.rb +++ b/app/helpers/application_helper.rb @@ -132,7 +132,7 @@ module ApplicationHelper stylesheets << "\n" end stylesheets << "\n" if page.design.reset_css - # stylesheets << "\n" + stylesheets << "\n" stylesheets << "\n" if page.design.default_css theme = page.design.themes.detect{ |d| d.id == page.theme_id } stylesheets << "\n" if theme diff --git a/app/views/admin/sites/site_info.html.erb b/app/views/admin/sites/site_info.html.erb index 64916d4d..f3315293 100644 --- a/app/views/admin/sites/site_info.html.erb +++ b/app/views/admin/sites/site_info.html.erb @@ -9,15 +9,17 @@ <% end %>
-
- +
- <%= f.check_box :title_always_on %> <%= t 'admin.always_display_title' %> +
<% @site_valid_locales.each do |locale|%> <%= content_tag :div, :class => "tab-pane fade #{active_when_current_locale_eq locale} #{locale}" do %>
+
<%= f.fields_for :title, @site.title do |f| %> <%= f.text_field locale, :class => "input-xxlarge" %> diff --git a/lib/parsers/parser_common.rb b/lib/parsers/parser_common.rb index 6ee09656..f79365d6 100644 --- a/lib/parsers/parser_common.rb +++ b/lib/parsers/parser_common.rb @@ -41,8 +41,19 @@ module ParserCommon ad_banner = AdBanner.find(banner["id"]) rescue nil if ad_banner res << "" + res << "" res << "
" printable_ad_images = [] ad_banner.ad_images.each do |ad_image| @@ -55,7 +66,7 @@ module ParserCommon printable_ad_images.shuffle! printable_ad_images.each do |ad_image| #TODO Need Reflact res << "

Tags

- <% @tags.each do |tag| %> - <%= content_tag :label,:class => "checkbox inline" do -%> - <%= check_box_tag 'bulletin[tag_ids][]', tag.id, @bulletin.tag_ids.include?(tag.id)%> - <%= tag[I18n.locale] %> +

+ <% @tags.each do |tag| %> + <%= content_tag :label,:class => "checkbox inline" do -%> + <%= check_box_tag 'bulletin[tag_ids][]', tag.id, @bulletin.tag_ids.include?(tag.id)%> + <%= tag[I18n.locale] %> + <% end %> <% end %> - <% end %> +

+ Default + Default + Default + Default +
+
<% if params[:action] != 'new' %> diff --git a/vendor/built_in_modules/web_resource/app/views/panel/web_resource/back_end/web_links/index.html.erb b/vendor/built_in_modules/web_resource/app/views/panel/web_resource/back_end/web_links/index.html.erb index da1e287b..8a300f7a 100644 --- a/vendor/built_in_modules/web_resource/app/views/panel/web_resource/back_end/web_links/index.html.erb +++ b/vendor/built_in_modules/web_resource/app/views/panel/web_resource/back_end/web_links/index.html.erb @@ -16,9 +16,9 @@ <% end %> -
- <%= link_to content_tag(:i, nil, :class => 'icon-plus icon-white') + t('announcement.add_new'), new_panel_web_resource_back_end_web_link_path, :class => 'btn btn-primary' %> + <%= link_to content_tag(:i, nil, :class => 'icon-plus icon-white') + t('announcement.add_new'), new_panel_web_resource_back_end_web_link_path, :class => 'btn btn-primary pull-right' %> +