From 23aef52422cb5679e60d8dce348a37016253e91a Mon Sep 17 00:00:00 2001 From: Harry Bomrah Date: Tue, 27 May 2014 18:18:23 +0800 Subject: [PATCH] now names saved in all locales while signup. added orbit site logo and also now favicon is rendered and orbit bar logo rendered. --- app/assets/images/site-logo.png | Bin 0 -> 2166 bytes .../javascripts/basic/orbit_js_1.0.1.js | 1 + app/assets/javascripts/lib/site_set.js | 6 ++-- .../lib/orbit_bar/orbit-bar.scss.erb | 20 +++++++---- app/controllers/pages_controller.rb | 2 ++ app/controllers/sessions_controller.rb | 12 +++++-- app/controllers/users_controller.rb | 21 ++++++------ app/helpers/application_helper.rb | 2 +- app/models/site.rb | 1 + app/models/user.rb | 4 +++ .../orbit_bootstrap/partial/_head.html.erb | 2 +- app/views/admin/sites/preference.html.erb | 31 ++++++++++++++++++ app/views/orbit_bar/index.html.erb | 6 +++- config/locales/en.yml | 1 + 14 files changed, 84 insertions(+), 25 deletions(-) create mode 100644 app/assets/images/site-logo.png diff --git a/app/assets/images/site-logo.png b/app/assets/images/site-logo.png new file mode 100644 index 0000000000000000000000000000000000000000..695bdf46afad47610028c44d7b827b06d8ff7bba GIT binary patch literal 2166 zcmV-+2#NQJP)l^-F{aY6+@jCG9onL$Sd;a|F#*r_@`EP|v}Ba!J{VCt!0_ z>&%nBSn%tagWg2I=fN&8S@O{!QCr#soj3{>-0#|Bux+64ZN%xsF|a8r_Abz2DY))A z2VM3KFo!!q)uuhDKY-hQ=mlU@?HaS=KG`1Cybl&Ij%BwF4tY!(#OBA~0CTtyXICs5 z*akr#f&k3nu00ylnsnJ?YRHLUuqnFaJo0R{147<=2N>bLuak&Zne{_=&!hudMY;Uruzes2Z8 zuK2HyI{T3o1!M1ham6(`qUNopP}O-pnG*1u2KAEHW-Y|#ttPK_(IvSY5Ix94gxl(} z0l=6YubgRj)d>Mya6uo$u1L$&nMEb*NdRAoxQ^75;2lv`AJW;9mh63<4(ak(X@sg|9 z83mUv&+B@u;uKfZ$N|RxoJRF(v1c7B7FBRgbQ4j%?HM)2aPe9NFh%^`^?2NCqT^qx z0H&A)d5s*8+7IeDEDAWI7#>BAC*3r~Oj9Nd7#ESL+9BlWKq8}PA1MV#^_nq?5H_*} z_&xG7qTp0E2D@D~k%6rA zHID&j{My3nm9Xz6K6oE2C;A-eB+In>goFdO3wpy1PD8gFg3l=Hvv#6@Z7q5I1)4*C z3AI>4_}1oLb{tHVNvpcBP}MwPG$qPcDZsUZBW+uXYF-Bh_?GB%eoIUf0k|%nnj*DH zwuA0DXEYnRLj1iDQn2Gk;>-e3@%+0HGmjH5 zsslPpp>33~XDxhcsOH=49;o+@&^xxiRG*xPyKjtkdav!ov7ETgpq4%M1a5|HOjV_8 z-5~tfWWya1+&#vHqc44<>T(<=sD39*X3S3QzUmTVLb#h_?VB9wSsw&o??tys!Z^B6 z1g&&Zm?8B(5Qo3cSStbZRR_jhJp1$hfHsOHrQrRiW9Bdjx2z^WO^rP zb|U%CKoPLXRgW^BA~OsZ3K(x1;g+H!i(#WcAYyxy)gqWF;SJ~{V4@0K7ZW}aZm8Is zOj{usSF=FCRzp$YRjtF?5J}W}xv3e}>H+N3UD7TGzyBg2fZlL$5+*-Py1j zYf8kozdeBi<4|yIKk+9!HngklXrJMAjX-U^SpoO^UF8E*6r5RjU>Wt~&A2VmnQg&U zK0{gM{ovfN5;KcR@)B+na3Rs?ChNVE2v-fT%&^DgjLozMaCeOOX#1owrjwaqztDZi z2I0zomknlz?x{ai$wi~B3_ScQV6eYV1=j)hHwB|oWb3GNT`L(iEKqYT-p+MyThYv- zWoL)9EIO~10)uqP7;m+{RG+jAMP!%E9w=`ZGjv_^sWz=d)fOhctZiL1H0n$NvhvDG ze5E6_xC?Fb#M|b<odujBxlQ_iG-zR*EVlU&csA2 zR~>4B0${?fHak~eb~^{y<^4JSh;2xG{vXQ70~$ z!8&el0b5e@(v{*tF96p-XY8wftOIm4*0fsg>owp8=&GiynutMm{N!>0p?82=U{^(l sjGdlDs5VH0>pen^7A;z|%KjH%03vK(ZlFjiF8}}l07*qoM6N<$f+mOx6#xJL literal 0 HcmV?d00001 diff --git a/app/assets/javascripts/basic/orbit_js_1.0.1.js b/app/assets/javascripts/basic/orbit_js_1.0.1.js index 521ab1d..a5dee8d 100755 --- a/app/assets/javascripts/basic/orbit_js_1.0.1.js +++ b/app/assets/javascripts/basic/orbit_js_1.0.1.js @@ -15,6 +15,7 @@ if($.support.touch) { !function ($) { // Set sidebarState sidebarState = function (v) { + console.log(v) if(v) { window.localStorage.setItem('sidebarState', 1); } else { diff --git a/app/assets/javascripts/lib/site_set.js b/app/assets/javascripts/lib/site_set.js index 5afac7b..e94da20 100755 --- a/app/assets/javascripts/lib/site_set.js +++ b/app/assets/javascripts/lib/site_set.js @@ -55,10 +55,10 @@ $(function() { } $('.set-sidebar-state').on({ change: function() { - if($(this).prop('checked')) { - sidebarState(1); - } else { + if($(this).parent().hasClass("disable")) { sidebarState(0); + } else { + sidebarState(1); } } }) diff --git a/app/assets/stylesheets/lib/orbit_bar/orbit-bar.scss.erb b/app/assets/stylesheets/lib/orbit_bar/orbit-bar.scss.erb index 1cce846..96232b9 100644 --- a/app/assets/stylesheets/lib/orbit_bar/orbit-bar.scss.erb +++ b/app/assets/stylesheets/lib/orbit_bar/orbit-bar.scss.erb @@ -311,10 +311,16 @@ $orbit-bar-bgc-lighter: lighten($orbit-bar-bgc, 20%) !default; .orbit-bar-logo { @extend .orbitMenuLink; padding: 0; - background-position: center; - background-repeat: no-repeat; - background-image: url('<%= asset_path 'orbit-logo.svg' %>'); - background-image: url('<%= asset_path 'orbit-logo.png' %>')\9; + text-align: center; + img { + display: inline-block; + width: auto; + height: 85%; + } + // background-position: center; + // background-repeat: no-repeat; + // background-image: url('<%= asset_path 'orbit-logo.svg' %>'); + // background-image: url('<%= asset_path 'orbit-logo.png' %>')\9; & + ul { left: 0; } @@ -384,10 +390,10 @@ $orbit-bar-bgc-lighter: lighten($orbit-bar-bgc, 20%) !default; margin-left: -45%; .login-body { form { - width: 100%; + width: 85%; } - .input-prepend { - .input-xlarge { + .prepend { + .input { width: 80%; } } diff --git a/app/controllers/pages_controller.rb b/app/controllers/pages_controller.rb index 5a3db86..71a639f 100644 --- a/app/controllers/pages_controller.rb +++ b/app/controllers/pages_controller.rb @@ -218,6 +218,8 @@ class PagesController < ApplicationController viewarea = doc.css("*[data-content='true']")[0] viewarea.inner_html = render_to_string(original_view) end + link = doc.css("link")[0] + link.attributes["href"].value = current_site.favicon.url.nil? ? "/assets/favicon.ico" : current_site.favicon.url doc.to_html else diff --git a/app/controllers/sessions_controller.rb b/app/controllers/sessions_controller.rb index 5d447ee..072dac3 100644 --- a/app/controllers/sessions_controller.rb +++ b/app/controllers/sessions_controller.rb @@ -7,8 +7,16 @@ class SessionsController < ApplicationController def create user = User.find_by(user_name: params[:user_name]) rescue nil if (user && user.authenticate(params[:password]) && user.is_confirmed?.eql?(true)) - session[:user_id] = user.id - redirect_to admin_dashboards_path, :notice => "Logged in!" + if user.is_approved? + session[:user_id] = user.id + redirect_to admin_dashboards_path, :notice => "Logged in!" + elsif user.is_admin? + session[:user_id] = user.id + redirect_to admin_dashboards_path, :notice => "Logged in!" + else + flash.now.alert = "User not approved." + render "new" + end else flash.now.alert = "Invalid username or password" render "new" diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb index 890bf71..a469f81 100644 --- a/app/controllers/users_controller.rb +++ b/app/controllers/users_controller.rb @@ -5,8 +5,15 @@ class UsersController < ApplicationController end def create + firstname = {} + lastname = {} + @site_valid_locales.each do |locale| + firstname[locale] = params[:first_name] + lastname[locale] = params[:last_name] + end + @user = User.new(user_params) - @member = MemberProfile.new(email: params[:email], first_name: params[:first_name], last_name: params[:last_name]) + @member = MemberProfile.new(email: params[:email], first_name_translations: firstname, last_name_translations: lastname) if @user.save @member.save @user.update_attributes(member_profile_id: @member.id) @@ -49,7 +56,7 @@ class UsersController < ApplicationController def basic_info_update @user = User.find(params[:id]) member_profile = @user.member_profile - if member_profile.update_attributes(basic_info_params) + if member_profile.update_attributes(p) redirect_to users_role_page_path(:user_id => @user.id.to_s) else render :action=> "form_page" @@ -76,21 +83,15 @@ class UsersController < ApplicationController response = {} case params[:type] when "user_id" - response["success"] = User.where(:user_id => params[:value]).count > 0 ? false : true + response["success"] = User.where(:user_name => params[:value]).count > 0 ? false : true when "user_email" - response["success"] = User.where(:email => params[:value]).count > 0? false : true + response["success"] = MemberProfile.where(:email => params[:value]).count > 0 ? false : true end render :json => response.to_json end private - def email_template(token) - html = "

Thank you for registering your site with Orbit! Please click on the following link and confirm. This is to make sure we could provide you with a spam free experience. Thanks a lot.

" - html = html + "Sitemap" end diff --git a/app/models/site.rb b/app/models/site.rb index a02fb1e..b5d47af 100644 --- a/app/models/site.rb +++ b/app/models/site.rb @@ -33,6 +33,7 @@ class Site mount_uploader :default_image, ImageUploader + mount_uploader :site_logo, ImageUploader mount_uploader :favicon, ImageUploader mount_uploader :mobile_icon, ImageUploader def to_param diff --git a/app/models/user.rb b/app/models/user.rb index fa78aad..34c4381 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -91,6 +91,10 @@ class User end end + def is_approved? + self.approved + end + def is_manager?(module_app) if ((module_app.user_module_managers.include?(self.id) rescue nil) && (!self.is_admin?)) true diff --git a/app/templates/orbit_bootstrap/partial/_head.html.erb b/app/templates/orbit_bootstrap/partial/_head.html.erb index 51a246a..96ae964 100644 --- a/app/templates/orbit_bootstrap/partial/_head.html.erb +++ b/app/templates/orbit_bootstrap/partial/_head.html.erb @@ -1,6 +1,6 @@ - + Orbit Classic <%= stylesheet_link_tag "default"%> <%= javascript_include_tag "lib/jquery-1.11.0.min"%> diff --git a/app/views/admin/sites/preference.html.erb b/app/views/admin/sites/preference.html.erb index ffffd5c..3f5a2c2 100644 --- a/app/views/admin/sites/preference.html.erb +++ b/app/views/admin/sites/preference.html.erb @@ -238,6 +238,37 @@ +
+ +
+ +
+
+ <% if @site.site_logo.file.present? %> + <%= image_tag( @site.site_logo, :size=>"120x120") rescue ''%> + <% else %> + <%= image_tag "site-logo.png", :class => "pull-left upload-picture"%> + <% end %> +
+
+ <% if @site.site_logo.file.present?%> + + <%= f.file_field :site_logo, :id => "input-upload", :class => 'fileupload-new', :onchange => "document.getElementById('fu').innerHTML = this.form.fu.value = this.value;" %><%= t('preferences.change') %> + + <%= f.check_box :remove_site_logo %> + <%= t(:remove) %> <%= t('preferences.site_logo') %> + <%else%> + + <%= f.file_field :site_logo, :id => "input-upload", :class => 'fileupload-new', :onchange => "document.getElementById('fu').innerHTML = this.form.fu.value = this.value;" %><%= t('preferences.select_image') %> + + <%end%> + + <%= t(:cancel) %> + +
+
+ +
diff --git a/app/views/orbit_bar/index.html.erb b/app/views/orbit_bar/index.html.erb index dd053fe..3c58bad 100644 --- a/app/views/orbit_bar/index.html.erb +++ b/app/views/orbit_bar/index.html.erb @@ -24,6 +24,8 @@
+
Or
+ Sign up <% end %> @@ -38,7 +40,9 @@
  • - + <% if !current_user.nil? %>
    • diff --git a/config/locales/en.yml b/config/locales/en.yml index e18fead..9c1d342 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -406,6 +406,7 @@ en: classification: Classification frontend_open: "If Checked, the frontend will be open for all users." favicon: Favicon + site_logo: Site Logo icon: Icon language: Language lang_detection: Enable User Language Detection