diff --git a/app/assets/images/site-logo.png b/app/assets/images/site-logo.png new file mode 100644 index 0000000..695bdf4 Binary files /dev/null and b/app/assets/images/site-logo.png differ 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 @@