diff --git a/app/assets/javascripts/admin/store_manager.js b/app/assets/javascripts/admin/store_manager.js index 5bbeb17..93dfedd 100644 --- a/app/assets/javascripts/admin/store_manager.js +++ b/app/assets/javascripts/admin/store_manager.js @@ -1,8 +1,9 @@ -var StoreManager = function(){ +var StoreManager = function(section){ var storeArea = $("#store-area"), loadingArea = storeArea.find(".loading-store"), loadingAreaStatus = loadingArea.find(".loading-status"), waitForStoreResponseCount = 0, + section = section, formArea = storeArea.find(".form-area"); var initialize = function(){ @@ -35,7 +36,11 @@ var StoreManager = function(){ }).done(function(data){ if(data.success){ loadingAreaStatus.text("Fetching store data."); - setTimeout(loadTemplateStore,1000); + if(section == "templates"){ + setTimeout(loadTemplateStore,1000); + }else if(section == "apps"){ + setTimeout(loadAppStore,1000); + } }else if(!data.success){ loadingArea.find("img").hide(); loadingAreaStatus.text(data.message); @@ -65,6 +70,26 @@ var StoreManager = function(){ }).fail(showError); } + var loadAppStore = function(){ + $.ajax({ + "type" : "get", + "dataType" : "html", + "url" : "/admin/store/app_store" + }).done(function(html){ + storeArea.html(html); + }).fail(showError); + } + + var loadTemplateStore = function(){ + $.ajax({ + "type" : "get", + "dataType" : "html", + "url" : "/admin/store/template_store" + }).done(function(html){ + storeArea.html(html); + }).fail(showError); + } + var loadRegisterForm = function(){ loadingAreaStatus.text("Loading registeration form.") $.ajax({ @@ -135,7 +160,7 @@ var StoreManager = function(){ }).done(function(data){ if(data.success){ loadingArea.find("img").hide(); - loadingAreaStatus.text("Email sent. Please verify and click on link below or refresh the page."); + loadingAreaStatus.text("Email sent. Please confirm and click on link below or refresh the page."); var checkAgainBtn = $("Check Again"); checkAgainBtn.on("click",function(){ initialize(); diff --git a/app/controllers/admin/module_store_controller.rb b/app/controllers/admin/module_store_controller.rb index b08c4c8..c6ac85f 100644 --- a/app/controllers/admin/module_store_controller.rb +++ b/app/controllers/admin/module_store_controller.rb @@ -3,20 +3,21 @@ class Admin::ModuleStoreController < OrbitAdminController def index @extensions = [] - if current_site.site_token? - if current_site.store_confirmation - @extensions = get_extensions - @store_confirmation = true - else - @extensions = [] - @store_confirmation = false - end - @downloaded_extensions = get_downloaded_extension - else - @store_confirmation = true - @extensions = [] - @downloaded_extensions = get_downloaded_extension - end + @downloaded_extensions = get_downloaded_extension + # if current_site.site_token? + # if current_site.store_confirmation + # @extensions = get_extensions + # @store_confirmation = true + # else + # @extensions = [] + # @store_confirmation = false + # end + + # else + # @store_confirmation = true + # @extensions = [] + # @downloaded_extensions = get_downloaded_extension + # end end def show diff --git a/app/controllers/admin/store_controller.rb b/app/controllers/admin/store_controller.rb index e0f8f2b..c98c930 100644 --- a/app/controllers/admin/store_controller.rb +++ b/app/controllers/admin/store_controller.rb @@ -17,6 +17,10 @@ class Admin::StoreController < OrbitAdminController def template_store + end + + def app_store + end def send_email diff --git a/app/views/admin/designs/index.html.erb b/app/views/admin/designs/index.html.erb index 1f0da20..072cc2a 100644 --- a/app/views/admin/designs/index.html.erb +++ b/app/views/admin/designs/index.html.erb @@ -152,7 +152,7 @@
<%= t(:template_store) %>
- <%= render "admin/store/templates" %> + <%= render :partial => "admin/store/store", :locals => {:section => "templates"} %>
diff --git a/app/views/admin/module_store/index.html.erb b/app/views/admin/module_store/index.html.erb index 578ab71..1b1614f 100644 --- a/app/views/admin/module_store/index.html.erb +++ b/app/views/admin/module_store/index.html.erb @@ -180,49 +180,10 @@
<%= t(:module_store) %>
- <% if @extensions.empty? %> - <% if @store_confirmation %> - <%#= render :partial => "admin/site_registration/site_registration" %> - <% else %> - <%#= render :partial => "admin/site_registration/not_confirmed_store" %> - <% end %> - <% else %> - - - - - - - - - - <% @extensions.each do |extension|%> - - - - <% @module_installed = File.read("downloaded_extensions.rb").include?(extension["key"])%> - <% if @module_installed.eql?(true)%> - - <% else %> - - <% end %> - - <% end %> - -
Module TitleDescriptionActive
-
- -
-
<%=link_to extension["title"], admin_module_store_show_path(:id => extension["_slugs"][0])%>
-

<%=extension["author"]%>

- 		- <%= extension["description"].html_safe%> <%=link_to extension["title"], admin_module_store_show_path(:id => extension["_slugs"][0])%> - Installed<%= link_to t(:install), admin_module_store_download_path(:id => extension["_slugs"][0]), :class=>"act btn btn-success" %>
- <% end %> -
+ <%= render :partial => "admin/store/store", :locals => {:section => "apps"} %> +
-
diff --git a/app/views/admin/store/_templates.html.erb b/app/views/admin/store/_store.html.erb similarity index 93% rename from app/views/admin/store/_templates.html.erb rename to app/views/admin/store/_store.html.erb index 48c7e5e..0af6591 100644 --- a/app/views/admin/store/_templates.html.erb +++ b/app/views/admin/store/_store.html.erb @@ -32,5 +32,5 @@ \ No newline at end of file diff --git a/app/views/admin/store/app_store.html.erb b/app/views/admin/store/app_store.html.erb new file mode 100644 index 0000000..314c765 --- /dev/null +++ b/app/views/admin/store/app_store.html.erb @@ -0,0 +1 @@ +This is app store. \ No newline at end of file diff --git a/config/routes.rb b/config/routes.rb index 11ab02f..cd62b5e 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -225,6 +225,7 @@ Orbit::Application.routes.draw do post "/store/register_site" => "store#register_site" get "/store/check_permissions" => "store#check_permissions" get "/store/template_store" => "store#template_store" + get "/store/app_store" => "store#app_store" get "/store/send_email" => "store#send_email"