From defa641e7e90049b0237403b61188ce75b786f24 Mon Sep 17 00:00:00 2001 From: Michel Felipe Date: Fri, 22 May 2015 14:26:28 -0300 Subject: [PATCH] Added initial structure with header + left sidebar into responsive features --- plugins/responsive/lib/ext/application_helper.rb | 30 +++++++++++++++++++++++++++++- plugins/responsive/views/layouts/_menu_responsive.html.erb | 3 +-- public/designs/themes/cube-responsive/bootstrap/_variables.scss | 864 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ public/designs/themes/cube-responsive/favicon.ico | Bin 0 -> 1150 bytes public/designs/themes/cube-responsive/footer.html.erb | 9 +++++++++ public/designs/themes/cube-responsive/header.html.erb | 17 +++++++++++++++++ public/designs/themes/cube-responsive/header_not_user_right.html.erb | 8 ++++++++ public/designs/themes/cube-responsive/header_user_notices.html.erb | 181 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ public/designs/themes/cube-responsive/header_user_right_menu.html.erb | 36 ++++++++++++++++++++++++++++++++++++ public/designs/themes/cube-responsive/icons/16x16/actions/log-in.png | Bin 0 -> 684 bytes public/designs/themes/cube-responsive/icons/16x16/actions/log-out.png | Bin 0 -> 484 bytes public/designs/themes/cube-responsive/images/.DS_Store | Bin 0 -> 6148 bytes public/designs/themes/cube-responsive/images/cube-logo-black.png | Bin 0 -> 3587 bytes public/designs/themes/cube-responsive/images/logo-black.png | Bin 0 -> 3587 bytes public/designs/themes/cube-responsive/images/logo-noosfero-header.png | Bin 0 -> 6360 bytes public/designs/themes/cube-responsive/images/logo-noosfero-no-text.png | Bin 0 -> 9248 bytes public/designs/themes/cube-responsive/images/logo-noosfero-raw.png | Bin 0 -> 6360 bytes public/designs/themes/cube-responsive/images/logo-noosfero.png | Bin 0 -> 12837 bytes public/designs/themes/cube-responsive/images/logo-noosfero.xcf | Bin 0 -> 23694 bytes public/designs/themes/cube-responsive/images/logo-noosfero0.xcf | Bin 0 -> 23694 bytes public/designs/themes/cube-responsive/images/logo-small.png | Bin 0 -> 1971 bytes public/designs/themes/cube-responsive/images/logo.png | Bin 0 -> 3486 bytes public/designs/themes/cube-responsive/images/rails.png | Bin 0 -> 1787 bytes public/designs/themes/cube-responsive/images/samples/.DS_Store | Bin 0 -> 12292 bytes public/designs/themes/cube-responsive/images/samples/messages-photo-1.png | Bin 0 -> 4630 bytes public/designs/themes/cube-responsive/images/samples/messages-photo-2.png | Bin 0 -> 4668 bytes public/designs/themes/cube-responsive/images/samples/messages-photo-3.png | Bin 0 -> 4794 bytes public/designs/themes/cube-responsive/images/samples/scarlet-159.png | Bin 0 -> 54052 bytes public/designs/themes/cube-responsive/images/samples/scarlett-300.jpg | Bin 0 -> 32337 bytes public/designs/themes/cube-responsive/images/thin-logo.png | Bin 0 -> 6098 bytes public/designs/themes/cube-responsive/images/thin-logo.xcf | Bin 0 -> 8103 bytes public/designs/themes/cube-responsive/images/thin-logo0.png | Bin 0 -> 6098 bytes public/designs/themes/cube-responsive/images/thin-logo0.xcf | Bin 0 -> 8103 bytes public/designs/themes/cube-responsive/imgs/50x.png | Bin 0 -> 97851 bytes public/designs/themes/cube-responsive/imgs/arrow-down-p.png | Bin 0 -> 233 bytes public/designs/themes/cube-responsive/imgs/arrow-right-p.png | Bin 0 -> 215 bytes public/designs/themes/cube-responsive/imgs/blog-sep.png | Bin 0 -> 161 bytes public/designs/themes/cube-responsive/imgs/colivre-nascente-cinza.gif | Bin 0 -> 1611 bytes public/designs/themes/cube-responsive/imgs/comment-bg-L.png | Bin 0 -> 188 bytes public/designs/themes/cube-responsive/imgs/comment-bg-N.png | Bin 0 -> 187 bytes public/designs/themes/cube-responsive/imgs/comment-bg-NL.png | Bin 0 -> 262 bytes public/designs/themes/cube-responsive/imgs/comment-bg-NO.png | Bin 0 -> 391 bytes public/designs/themes/cube-responsive/imgs/comment-bg-O.png | Bin 0 -> 192 bytes public/designs/themes/cube-responsive/imgs/comment-bg-S.png | Bin 0 -> 224 bytes public/designs/themes/cube-responsive/imgs/comment-bg-SL.png | Bin 0 -> 263 bytes public/designs/themes/cube-responsive/imgs/comment-bg-SO.png | Bin 0 -> 279 bytes public/designs/themes/cube-responsive/imgs/comment-owner-bg-L.png | Bin 0 -> 188 bytes public/designs/themes/cube-responsive/imgs/comment-owner-bg-N.png | Bin 0 -> 235 bytes public/designs/themes/cube-responsive/imgs/comment-owner-bg-NL.png | Bin 0 -> 261 bytes public/designs/themes/cube-responsive/imgs/comment-owner-bg-NO.png | Bin 0 -> 515 bytes public/designs/themes/cube-responsive/imgs/comment-owner-bg-O.png | Bin 0 -> 198 bytes public/designs/themes/cube-responsive/imgs/comment-owner-bg-S.png | Bin 0 -> 223 bytes public/designs/themes/cube-responsive/imgs/comment-owner-bg-SL.png | Bin 0 -> 259 bytes public/designs/themes/cube-responsive/imgs/comment-owner-bg-SO.png | Bin 0 -> 273 bytes public/designs/themes/cube-responsive/imgs/content-bg-L.png | Bin 0 -> 154 bytes public/designs/themes/cube-responsive/imgs/content-bg-N.png | Bin 0 -> 156 bytes public/designs/themes/cube-responsive/imgs/content-bg-NL.png | Bin 0 -> 228 bytes public/designs/themes/cube-responsive/imgs/content-bg-NO.png | Bin 0 -> 214 bytes public/designs/themes/cube-responsive/imgs/content-bg-O.png | Bin 0 -> 153 bytes public/designs/themes/cube-responsive/imgs/content-bg-S.png | Bin 0 -> 156 bytes public/designs/themes/cube-responsive/imgs/content-bg-SL.png | Bin 0 -> 216 bytes public/designs/themes/cube-responsive/imgs/content-bg-SO.png | Bin 0 -> 217 bytes public/designs/themes/cube-responsive/imgs/down-arrow-light.png | Bin 0 -> 169 bytes public/designs/themes/cube-responsive/imgs/lettering-slbr.png | Bin 0 -> 2102 bytes public/designs/themes/cube-responsive/imgs/li-blue.gif | Bin 0 -> 88 bytes public/designs/themes/cube-responsive/imgs/li-gray.gif | Bin 0 -> 88 bytes public/designs/themes/cube-responsive/imgs/li-recent.gif | Bin 0 -> 88 bytes public/designs/themes/cube-responsive/imgs/link-list-current-bg.png | Bin 0 -> 192 bytes public/designs/themes/cube-responsive/imgs/menu-top-bg-left.png | Bin 0 -> 195 bytes public/designs/themes/cube-responsive/imgs/menu-top-bg-right.png | Bin 0 -> 218 bytes public/designs/themes/cube-responsive/imgs/menu-top-bg.png | Bin 0 -> 177 bytes public/designs/themes/cube-responsive/imgs/menu-top-hilight.png | Bin 0 -> 228 bytes public/designs/themes/cube-responsive/js/scripts.js | 149 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ public/designs/themes/cube-responsive/layouts/application-responsive.html.erb | 83 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ public/designs/themes/cube-responsive/navigation.html.erb | 4 ++++ public/designs/themes/cube-responsive/sass/_theme_styles.scss | 20 ++++++++++++++++++++ public/designs/themes/cube-responsive/sass/imports/_customs.scss | 83 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ public/designs/themes/cube-responsive/sass/imports/_fixed_layouts.scss | 49 +++++++++++++++++++++++++++++++++++++++++++++++++ public/designs/themes/cube-responsive/sass/imports/_footer.scss | 25 +++++++++++++++++++++++++ public/designs/themes/cube-responsive/sass/imports/_header.scss | 516 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ public/designs/themes/cube-responsive/sass/imports/_layouts.scss | 273 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ public/designs/themes/cube-responsive/sass/imports/_mixins.scss | 63 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ public/designs/themes/cube-responsive/sass/imports/_sidebar.scss | 274 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ public/designs/themes/cube-responsive/sass/imports/_skins.scss | 2 ++ public/designs/themes/cube-responsive/sass/imports/_variables.scss | 89 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ public/designs/themes/cube-responsive/sass/imports/sidebar/_open_active.scss | 46 ++++++++++++++++++++++++++++++++++++++++++++++ public/designs/themes/cube-responsive/sass/imports/sidebar/_submenu.scss | 49 +++++++++++++++++++++++++++++++++++++++++++++++++ public/designs/themes/cube-responsive/sass/imports/skins/_blue.scss | 102 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ public/designs/themes/cube-responsive/sass/imports/skins/_blue_gradient.scss | 109 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ public/designs/themes/cube-responsive/sidebar_user.html.erb | 418 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ public/designs/themes/cube-responsive/site_title.html.erb | 5 +++++ public/designs/themes/cube-responsive/style.scss | 10 ++++++++++ public/designs/themes/cube-responsive/theme.js | 149 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ public/designs/themes/cube-responsive/theme.yml | 5 +++++ 94 files changed, 3668 insertions(+), 3 deletions(-) create mode 100644 public/designs/themes/cube-responsive/bootstrap/_variables.scss create mode 100644 public/designs/themes/cube-responsive/favicon.ico create mode 100644 public/designs/themes/cube-responsive/footer.html.erb create mode 100644 public/designs/themes/cube-responsive/header.html.erb create mode 100644 public/designs/themes/cube-responsive/header_not_user_right.html.erb create mode 100644 public/designs/themes/cube-responsive/header_user_notices.html.erb create mode 100644 public/designs/themes/cube-responsive/header_user_right_menu.html.erb create mode 100644 public/designs/themes/cube-responsive/icons/16x16/actions/log-in.png create mode 100644 public/designs/themes/cube-responsive/icons/16x16/actions/log-out.png create mode 100644 public/designs/themes/cube-responsive/images/.DS_Store create mode 100644 public/designs/themes/cube-responsive/images/cube-logo-black.png create mode 100644 public/designs/themes/cube-responsive/images/logo-black.png create mode 100644 public/designs/themes/cube-responsive/images/logo-noosfero-header.png create mode 100644 public/designs/themes/cube-responsive/images/logo-noosfero-no-text.png create mode 100644 public/designs/themes/cube-responsive/images/logo-noosfero-raw.png create mode 100644 public/designs/themes/cube-responsive/images/logo-noosfero.png create mode 100644 public/designs/themes/cube-responsive/images/logo-noosfero.xcf create mode 100644 public/designs/themes/cube-responsive/images/logo-noosfero0.xcf create mode 100644 public/designs/themes/cube-responsive/images/logo-small.png create mode 100644 public/designs/themes/cube-responsive/images/logo.png create mode 100644 public/designs/themes/cube-responsive/images/rails.png create mode 100644 public/designs/themes/cube-responsive/images/samples/.DS_Store create mode 100644 public/designs/themes/cube-responsive/images/samples/messages-photo-1.png create mode 100644 public/designs/themes/cube-responsive/images/samples/messages-photo-2.png create mode 100644 public/designs/themes/cube-responsive/images/samples/messages-photo-3.png create mode 100644 public/designs/themes/cube-responsive/images/samples/scarlet-159.png create mode 100644 public/designs/themes/cube-responsive/images/samples/scarlett-300.jpg create mode 100644 public/designs/themes/cube-responsive/images/thin-logo.png create mode 100644 public/designs/themes/cube-responsive/images/thin-logo.xcf create mode 100644 public/designs/themes/cube-responsive/images/thin-logo0.png create mode 100644 public/designs/themes/cube-responsive/images/thin-logo0.xcf create mode 100644 public/designs/themes/cube-responsive/imgs/50x.png create mode 100644 public/designs/themes/cube-responsive/imgs/arrow-down-p.png create mode 100644 public/designs/themes/cube-responsive/imgs/arrow-right-p.png create mode 100644 public/designs/themes/cube-responsive/imgs/blog-sep.png create mode 100644 public/designs/themes/cube-responsive/imgs/colivre-nascente-cinza.gif create mode 100644 public/designs/themes/cube-responsive/imgs/comment-bg-L.png create mode 100644 public/designs/themes/cube-responsive/imgs/comment-bg-N.png create mode 100644 public/designs/themes/cube-responsive/imgs/comment-bg-NL.png create mode 100644 public/designs/themes/cube-responsive/imgs/comment-bg-NO.png create mode 100644 public/designs/themes/cube-responsive/imgs/comment-bg-O.png create mode 100644 public/designs/themes/cube-responsive/imgs/comment-bg-S.png create mode 100644 public/designs/themes/cube-responsive/imgs/comment-bg-SL.png create mode 100644 public/designs/themes/cube-responsive/imgs/comment-bg-SO.png create mode 100644 public/designs/themes/cube-responsive/imgs/comment-owner-bg-L.png create mode 100644 public/designs/themes/cube-responsive/imgs/comment-owner-bg-N.png create mode 100644 public/designs/themes/cube-responsive/imgs/comment-owner-bg-NL.png create mode 100644 public/designs/themes/cube-responsive/imgs/comment-owner-bg-NO.png create mode 100644 public/designs/themes/cube-responsive/imgs/comment-owner-bg-O.png create mode 100644 public/designs/themes/cube-responsive/imgs/comment-owner-bg-S.png create mode 100644 public/designs/themes/cube-responsive/imgs/comment-owner-bg-SL.png create mode 100644 public/designs/themes/cube-responsive/imgs/comment-owner-bg-SO.png create mode 100644 public/designs/themes/cube-responsive/imgs/content-bg-L.png create mode 100644 public/designs/themes/cube-responsive/imgs/content-bg-N.png create mode 100644 public/designs/themes/cube-responsive/imgs/content-bg-NL.png create mode 100644 public/designs/themes/cube-responsive/imgs/content-bg-NO.png create mode 100644 public/designs/themes/cube-responsive/imgs/content-bg-O.png create mode 100644 public/designs/themes/cube-responsive/imgs/content-bg-S.png create mode 100644 public/designs/themes/cube-responsive/imgs/content-bg-SL.png create mode 100644 public/designs/themes/cube-responsive/imgs/content-bg-SO.png create mode 100644 public/designs/themes/cube-responsive/imgs/down-arrow-light.png create mode 100644 public/designs/themes/cube-responsive/imgs/lettering-slbr.png create mode 100644 public/designs/themes/cube-responsive/imgs/li-blue.gif create mode 100644 public/designs/themes/cube-responsive/imgs/li-gray.gif create mode 100644 public/designs/themes/cube-responsive/imgs/li-recent.gif create mode 100644 public/designs/themes/cube-responsive/imgs/link-list-current-bg.png create mode 100644 public/designs/themes/cube-responsive/imgs/menu-top-bg-left.png create mode 100644 public/designs/themes/cube-responsive/imgs/menu-top-bg-right.png create mode 100644 public/designs/themes/cube-responsive/imgs/menu-top-bg.png create mode 100644 public/designs/themes/cube-responsive/imgs/menu-top-hilight.png create mode 100644 public/designs/themes/cube-responsive/js/scripts.js create mode 100644 public/designs/themes/cube-responsive/layouts/application-responsive.html.erb create mode 100644 public/designs/themes/cube-responsive/navigation.html.erb create mode 100644 public/designs/themes/cube-responsive/sass/_theme_styles.scss create mode 100644 public/designs/themes/cube-responsive/sass/imports/_customs.scss create mode 100644 public/designs/themes/cube-responsive/sass/imports/_fixed_layouts.scss create mode 100644 public/designs/themes/cube-responsive/sass/imports/_footer.scss create mode 100644 public/designs/themes/cube-responsive/sass/imports/_header.scss create mode 100644 public/designs/themes/cube-responsive/sass/imports/_layouts.scss create mode 100644 public/designs/themes/cube-responsive/sass/imports/_mixins.scss create mode 100644 public/designs/themes/cube-responsive/sass/imports/_sidebar.scss create mode 100644 public/designs/themes/cube-responsive/sass/imports/_skins.scss create mode 100644 public/designs/themes/cube-responsive/sass/imports/_variables.scss create mode 100644 public/designs/themes/cube-responsive/sass/imports/sidebar/_open_active.scss create mode 100644 public/designs/themes/cube-responsive/sass/imports/sidebar/_submenu.scss create mode 100644 public/designs/themes/cube-responsive/sass/imports/skins/_blue.scss create mode 100644 public/designs/themes/cube-responsive/sass/imports/skins/_blue_gradient.scss create mode 100644 public/designs/themes/cube-responsive/sidebar_user.html.erb create mode 100644 public/designs/themes/cube-responsive/site_title.html.erb create mode 100644 public/designs/themes/cube-responsive/style.scss create mode 100644 public/designs/themes/cube-responsive/theme.js create mode 100644 public/designs/themes/cube-responsive/theme.yml diff --git a/plugins/responsive/lib/ext/application_helper.rb b/plugins/responsive/lib/ext/application_helper.rb index ce49ff1..e0bfe6a 100644 --- a/plugins/responsive/lib/ext/application_helper.rb +++ b/plugins/responsive/lib/ext/application_helper.rb @@ -370,6 +370,35 @@ module ApplicationHelper form_for(name, { builder: NoosferoFormBuilder }.merge(options), &proc) end + # + # @todo Move this method to core application_helper.rb + # and make a merge request to master branch of noosfero + # + def method_missing(name, *args) + name = name.to_s + + if name.start_with? 'theme_' + + if name.include? '_not_user' + return include_partial name unless logged_in? + return + + elsif name.include? '_user' and !name.include? '_not' + return unless logged_in? + end + + include_partial name + end + end + + private + + def include_partial(name) + theme_value = self.instance_variable_get('@'+name) || theme_include(name.gsub('theme_','')) + + self.instance_variable_set('@'+name,theme_value) + end + # TODO: Make optional fields compliant to horizontal form # def optional_field profile, name, field_html = nil, only_required = false, &block # end @@ -419,4 +448,3 @@ module ApplicationHelper end end - diff --git a/plugins/responsive/views/layouts/_menu_responsive.html.erb b/plugins/responsive/views/layouts/_menu_responsive.html.erb index cc2b8a4..9bcf89d 100644 --- a/plugins/responsive/views/layouts/_menu_responsive.html.erb +++ b/plugins/responsive/views/layouts/_menu_responsive.html.erb @@ -1,6 +1,6 @@ <% user = (session[:user] && User.find_by_id(session[:user])) || nil %>
-