From a89e06087a97636d2af4816298d59024fc303092 Mon Sep 17 00:00:00 2001
From: Harry Bomrah <harry@rulingcom.com>
Date: Tue, 2 Dec 2014 21:10:15 +0800
Subject: [PATCH 1/2] store registration form changes

---
 app/assets/javascripts/admin/store_manager.js |  7 +++++--
 app/controllers/admin/store_controller.rb     |  7 +++++--
 app/views/admin/store/register_form.html.erb  | 12 ++++++++++++
 3 files changed, 22 insertions(+), 4 deletions(-)

diff --git a/app/assets/javascripts/admin/store_manager.js b/app/assets/javascripts/admin/store_manager.js
index 93dfedd..42a2292 100644
--- a/app/assets/javascripts/admin/store_manager.js
+++ b/app/assets/javascripts/admin/store_manager.js
@@ -102,7 +102,10 @@ var StoreManager = function(section){
 			var form = formArea.find("form");
 			new FormValidator(form);
 			form.on("submit",function(){
-				var email = form.find("#inputEmail").val();
+				var email = form.find("#inputEmail").val(),
+					site_title = {};
+				site_title["en"] = form.find("#input_site_title_en").val();
+				site_title["zh_tw"] = form.find("#input_site_title_zh_tw").val();
 				if(email){
 					loadingAreaStatus.text("Registering with Orbit Store.")
 					formArea.hide();
@@ -111,7 +114,7 @@ var StoreManager = function(section){
 						"type" : "post",
 						"url" : form.attr("action"),
 						"dataType" : "json",
-						"data" : {"email" : email}
+						"data" : {"email" : email, "site_title" : site_title}
 					}).done(function(data){
 						if(data.success){
 							loadingAreaStatus.text("Waiting for Store.");
diff --git a/app/controllers/admin/store_controller.rb b/app/controllers/admin/store_controller.rb
index 7370309..80632ba 100644
--- a/app/controllers/admin/store_controller.rb
+++ b/app/controllers/admin/store_controller.rb
@@ -12,7 +12,10 @@ class Admin::StoreController < OrbitAdminController
 	end
 
 	def register_form
-
+		tt = current_site.title_translations
+		@site_title_values = {}
+		@site_title_values["en"] = tt["en"]
+		@site_title_values["zh_tw"] = tt["zh_tw"]
 	end
 
 	def template_store
@@ -50,7 +53,7 @@ class Admin::StoreController < OrbitAdminController
 	end
 
 	def register_site
-		params_to_send = {'site_domain' => request.host_with_port, 'admin_email' => params["email"], "site_token" => current_site.uid}
+		params_to_send = {'site_domain' => request.host_with_port, 'admin_email' => params["email"], "site_token" => current_site.uid, "site_title" => params[:site_title] }
 		uri = URI.parse(@store_url)
 		http = Net::HTTP.new(uri.host,uri.port)
 		request = Net::HTTP::Post.new("/register/site")
diff --git a/app/views/admin/store/register_form.html.erb b/app/views/admin/store/register_form.html.erb
index cc311e9..08f0609 100644
--- a/app/views/admin/store/register_form.html.erb
+++ b/app/views/admin/store/register_form.html.erb
@@ -13,6 +13,18 @@
 	      <input type="text" id="inputEmail" placeholder="Email" name="admin_email" data-fv-validation="required;email;" data-fv-messages="Cannot be empty.;Not valid email.;">
 	    </div>
 	 </div>
+	 <div class="control-group">
+		<label class="control-label" for="input_site_title_zh_tw">Site Title (Chinese) : </label>
+	    <div class="controls">
+	      <input type="text" value="<%= @site_title_values["zh_tw"] %>" id="input_site_title_zh_tw" placeholder="Site Title (Chinese)" name="site_title[zh_tw]" data-fv-validation="required;" data-fv-messages="Cannot be empty.;">
+	    </div>
+	</div>
+	<div class="control-group">
+		<label class="control-label" for="input_site_title_en">Site Title (English) : </label>
+	    <div class="controls">
+	      <input type="text" value="<%= @site_title_values["en"] %>" id="input_site_title_en" placeholder="Site Title (English)" name="site_title[en]" data-fv-validation="required;" data-fv-messages="Cannot be empty.;">
+	    </div>
+	 </div>
 	 <div class="control-group">
 	 	<label class="control-label">Site Token  : </label>
 	    <div class="controls">

From 36f7e190113ab1ab4c52913729874b10ee1ef221 Mon Sep 17 00:00:00 2001
From: Harry Bomrah <harry@rulingcom.com>
Date: Wed, 3 Dec 2014 15:08:01 +0800
Subject: [PATCH 2/2] fixed assets for ckeditor

---
 lib/orbit_core_lib.rb | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/lib/orbit_core_lib.rb b/lib/orbit_core_lib.rb
index 5001c64..6b46264 100644
--- a/lib/orbit_core_lib.rb
+++ b/lib/orbit_core_lib.rb
@@ -61,12 +61,13 @@ module  OrbitCoreLib
           redirect_to new_session_path 
           return
         end
-        
         if !@module_app.nil?
           check_user_can_use
         else
           if current_user.nil? || !current_user.is_admin?
-            render "public/401"
+            if params["controller"] != "admin/assets"
+              render "public/401"
+            end
           end
         end
       end