Merge branch 'master' of github.com:saberma/shopqi

tobi · Oct 16, 2011 · c2c911f · c2c911f
2 parents da39748 + 8aecdaf
commit c2c911f
Show file tree

Hide file tree

Showing 241 changed files with 410 additions and 190 deletions.
diff --git a/app/assets/javascripts/admin_application.js.coffee b/app/assets/javascripts/admin_application.js.coffee
@@ -4,17 +4,21 @@
 # It's not advisable to add code directly here, but if you do, it'll appear at the bottom of the
 # the compiled file.
 #
-#=require jquery
+#=require jquery.min
 #=require jquery_ujs
-#=require jquery-ui
+#=require jquery-ui-1.8.14.custom.min
 #=require backbone_js
-#=require backbone/admin
 #=require plugins
 #=require rails.validations
 #=require jquery.blockUI
+#=require jquery.miniColors
+#=require jquery.MultiFile
+#=require fileuploader
 #=require plugins/jquery.guide
-#=require ./utils/utils
+#=require plugins/jquery.blank_slate
+#=require utils/utils
 #=require_self
+#=require backbone/admin
 
 #字符串
 @StringUtils =

diff --git a/app/assets/javascripts/application.js b/app/assets/javascripts/application.js
diff --git a/app/assets/javascripts/application.js.coffee b/app/assets/javascripts/application.js.coffee
@@ -0,0 +1,2 @@
+#=require jquery.min
+#=require rails.validations
diff --git a/app/assets/javascripts/backbone/admin.js.coffee b/app/assets/javascripts/backbone/admin.js.coffee
@@ -1,10 +1,29 @@
 #=require_self
-#=require ./models/task
-#=require ./views/tasks/checkoff
-#=require ./views/tasks/show
-#=require ./views/tasks/index
-#When the project deploy,I think we should take all the
-#backbone js file required
+#=require_tree ./models
+#=require_tree ./views/tasks
+#=require_tree ./views/products
+#=require_tree ./views/product_options
+#=require_tree ./views/orders
+#=require_tree ./views/customers
+#=require_tree ./views/customer_groups
+#=require_tree ./views/custom_collections
+#=require_tree ./views/link_lists
+#=require_tree ./views/themes
+#=require_tree ./views/domains
+#=require_tree ./views/assets
+#=require_tree ./views/comments
+#=require_tree ./views/payments
+#=require_tree ./controllers/orders
+#=require_tree ./controllers/customers
+#=require ./controllers/products
+#=require ./controllers/smart_collections
+#=require ./controllers/custom_collections
+#=require ./controllers/pages
+#=require ./controllers/users
+#=require ./controllers/comments
+#=require ./controllers/emails
+#=require ./controllers/articles
+
 window.App =
   Models: {}
   Views:

diff --git a/...sets/javascripts/backbone/theme.js.coffee → ...ets/javascripts/backbone/shopqi.js.coffee b/...sets/javascripts/backbone/theme.js.coffee → ...ets/javascripts/backbone/shopqi.js.coffee
@@ -1,14 +1,19 @@
 #=require_self
-#=require ./controllers/theme/themes/index
 #=require ./models/theme
+#=require ./controllers/theme/themes/index
+#=require_tree ./views/signup
 #=require_tree ./views/theme/themes
+
 window.App =
   Views:
+    Signup:
+      Theme: {}
     Theme:
       Themes:
         Index: {}
         Show: {}
   Controllers:
+    Themes: {}
     Theme:
       Themes: {}
   Collections: {}

diff --git a/app/assets/javascripts/backbone/signup.js.coffee b/app/assets/javascripts/backbone/signup.js.coffee
diff --git a/app/assets/javascripts/backbone_js.js.coffee b/app/assets/javascripts/backbone_js.js.coffee
@@ -1,4 +1,4 @@
 #=require underscore-min
-#=require backbone
+#=require backbone-min
 #=require handlebars
 #=require backbone.rails
diff --git a/app/assets/javascripts/checkout_application.js.coffee b/app/assets/javascripts/checkout_application.js.coffee
@@ -0,0 +1,2 @@
+#=require shop/checkout
+#=require plugins
diff --git a/app/assets/javascripts/shop_admin_application.js.coffee b/app/assets/javascripts/shop_admin_application.js.coffee
@@ -0,0 +1,3 @@
+#=require jquery.min
+#=require jquery_ujs
+#=require shop/account
diff --git a/...s/javascripts/theme_application.js.coffee → .../javascripts/shopqi_application.js.coffee b/...s/javascripts/theme_application.js.coffee → .../javascripts/shopqi_application.js.coffee
@@ -2,6 +2,7 @@
 #=require jquery_ujs
 #=require backbone_js
 #=require plugins
+#=require jquery.fancybox-1.3.4.pack
 #=require jquery.quicksand
-#=require jquery.fancybox-1.3.4
-#=require backbone/theme
+#=require backbone/shopqi
+#=require utils/utils
diff --git a/app/assets/javascripts/shopqi_wiki_application.js b/app/assets/javascripts/shopqi_wiki_application.js
@@ -0,0 +1,2 @@
+//=require_self
+//=require jquery
diff --git a/app/assets/javascripts/signup_application.js.coffee b/app/assets/javascripts/signup_application.js.coffee
diff --git a/app/assets/stylesheets/shopqi.css.scss.erb → ...ets/stylesheets/admin_shopqi.css.scss.erb b/app/assets/stylesheets/shopqi.css.scss.erb → ...ets/stylesheets/admin_shopqi.css.scss.erb
diff --git a/...sets/stylesheets/application.css.scss.erb → app/assets/stylesheets/application.css b/...sets/stylesheets/application.css.scss.erb → app/assets/stylesheets/application.css
@@ -3,5 +3,4 @@
  * and any sub-directories. You're free to add application-wide styles to this file and they'll appear at
  * the top of the compiled file, but it's generally better to create a new file per style scope.
  *= require_self
- *= require_tree .
 */
diff --git a/app/assets/stylesheets/dialog.css.scss.erb b/app/assets/stylesheets/dialog.css.scss.erb
@@ -1,6 +1,7 @@
-@import "utility.css";
-
-@import "forms.css";
+/*
+*= require utility
+*= require forms
+*/
 
 body {
   margin: 0;

diff --git a/app/assets/stylesheets/layout_admin.css.scss.erb b/app/assets/stylesheets/layout_admin.css.scss.erb
@@ -4,7 +4,9 @@
  * the top of the compiled file, but it's generally better to create a new file per style scope.
  *= require_self
  *= require admin
- *= require shopqi
+ *= require admin_shopqi
  *= require message_block
  *= require jquery-ui-1.8.14.custom
+ *= require jquery.miniColors
+ *= require fileuploader
 */
diff --git a/app/assets/stylesheets/print.css.scss.erb → ...ylesheets/layout_admin_print.css.scss.erb b/app/assets/stylesheets/print.css.scss.erb → ...ylesheets/layout_admin_print.css.scss.erb
diff --git a/app/assets/stylesheets/layout_application.css.scss.erb b/app/assets/stylesheets/layout_application.css.scss.erb
@@ -0,0 +1,8 @@
+/*
+ * This is a manifest file that'll automatically include all the stylesheets available in this directory
+ * and any sub-directories. You're free to add application-wide styles to this file and they'll appear at
+ * the top of the compiled file, but it's generally better to create a new file per style scope.
+ *= require dialog
+ *= require message_block
+ *= require_self
+*/
diff --git a/app/assets/stylesheets/layout_checkout.css.scss.erb b/app/assets/stylesheets/layout_checkout.css.scss.erb
@@ -0,0 +1,4 @@
+/*
+ *= require forms
+ *= require checkout
+*/
diff --git a/app/assets/stylesheets/layout_shop_admin.css.scss.erb b/app/assets/stylesheets/layout_shop_admin.css.scss.erb
@@ -0,0 +1,4 @@
+/*
+ *= require customer
+ *= require message_block
+*/
diff --git a/app/assets/stylesheets/layout_shopqi.css.scss.erb b/app/assets/stylesheets/layout_shopqi.css.scss.erb
@@ -0,0 +1,10 @@
+/*
+ * This is a manifest file that'll automatically include all the stylesheets available in this directory
+ * and any sub-directories. You're free to add application-wide styles to this file and they'll appear at
+ * the top of the compiled file, but it's generally better to create a new file per style scope.
+ *= require_self
+ *= require jquery.fancybox-1.3.4
+ *= require master
+ *= require mobile
+ *= require shopqi_signup
+*/
diff --git a/app/assets/stylesheets/layout_shopqi_theme.css.scss.erb b/app/assets/stylesheets/layout_shopqi_theme.css.scss.erb
@@ -0,0 +1,10 @@
+/*
+ * This is a manifest file that'll automatically include all the stylesheets available in this directory
+ * and any sub-directories. You're free to add application-wide styles to this file and they'll appear at
+ * the top of the compiled file, but it's generally better to create a new file per style scope.
+ *= require_self
+ *= require jquery.fancybox-1.3.4
+ *= require base_packaged
+ *= require resources-nav
+ *= require force-scrollbar
+*/
diff --git a/app/assets/stylesheets/layout_shopqi_wiki.css.scss.erb b/app/assets/stylesheets/layout_shopqi_wiki.css.scss.erb
@@ -0,0 +1,8 @@
+/*
+ * This is a manifest file that'll automatically include all the stylesheets available in this directory
+ * and any sub-directories. You're free to add application-wide styles to this file and they'll appear at
+ * the top of the compiled file, but it's generally better to create a new file per style scope.
+ *= require_self
+ *= require resources-nav
+ *= require wiki
+*/
diff --git a/...assets/stylesheets/ie-signup.css.scss.erb → ...stylesheets/shopqi_ie-signup.css.scss.erb b/...assets/stylesheets/ie-signup.css.scss.erb → ...stylesheets/shopqi_ie-signup.css.scss.erb
diff --git a/app/assets/stylesheets/signup.css.scss.erb → ...ts/stylesheets/shopqi_signup.css.scss.erb b/app/assets/stylesheets/signup.css.scss.erb → ...ts/stylesheets/shopqi_signup.css.scss.erb
diff --git a/app/helpers/admin/app_helper.rb b/app/helpers/admin/app_helper.rb
@@ -16,13 +16,10 @@ def link_to_delete(path)
 
   def use_kindeditor
     content_for :kindeditor do
-      javascript_include_tag("kindeditor/kindeditor-min","kindeditor/kindeditor_config")
-    end
-  end
-
-  def use_javascripts(*args)
-    content_for :javascripts do
-      javascript_include_tag(*args)
+      %Q(
+        <script src="/javascripts/kindeditor/kindeditor.js?1" type="text/javascript"></script>
+        <script src="/javascripts/kindeditor/kindeditor_config.js?1" type="text/javascript"></script>
+      ).html_safe
     end
   end
 

diff --git a/app/views/admin/account/index.html.haml b/app/views/admin/account/index.html.haml
@@ -1,4 +1,3 @@
--use_javascripts 'backbone/controllers/users'
 %h2#title 你的帐户信息
 #action-links
   %ul

diff --git a/app/views/admin/account/shop_theme_settings/show.html.haml b/app/views/admin/account/shop_theme_settings/show.html.haml
@@ -1,8 +1,3 @@
-=content_for :stylesheets do
-  =stylesheet_link_tag 'jquery.miniColors', 'fileuploader'
-=content_for :javascripts do
-  =javascript_include_tag 'backbone/models/preset', 'backbone/views/themes/settings/index', 'backbone/views/themes/settings/presets/show', 'backbone/views/themes/settings/presets/index', 'jquery.miniColors.min', 'fileuploader'
-
 %h2#title 主题外观配置
 #action-links
   %ul

diff --git a/app/views/admin/articles/new.html.haml b/app/views/admin/articles/new.html.haml
@@ -1,5 +1,5 @@
 - use_kindeditor
-- use_javascripts 'backbone/controllers/articles'
+
 %h2#title=w('new.article')
 #action-links
   %ul

diff --git a/app/views/admin/articles/show.html.haml b/app/views/admin/articles/show.html.haml
@@ -1,5 +1,4 @@
 -use_kindeditor
--use_javascripts 'backbone/controllers/articles'
 
 %h2#title
   =link_to "#{blog.title} - #{article.title}","#"

diff --git a/app/views/admin/assets/edit.html.haml b/app/views/admin/assets/edit.html.haml
@@ -1,8 +1,8 @@
 %html(xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en")
   %head
     %meta(http-equiv="content-type" content="text/html; charset=UTF-8")
-    = stylesheet_link_tag "admin"
-    = javascript_include_tag :admin_application, 'backbone/views/assets/index/edit'
+    = stylesheet_link_tag :layout_admin
+    = javascript_include_tag :admin_application
     = csrf_meta_tag
   %body
     #asset-details

diff --git a/app/views/admin/assets/index.html.haml b/app/views/admin/assets/index.html.haml
@@ -1,8 +1,3 @@
-=content_for :stylesheets do
-  =stylesheet_link_tag 'fileuploader'
-=content_for :javascripts do
-  =javascript_include_tag 'backbone/views/assets/index/index'
-
 %h2#title 模板编辑器
 #action-links
   %ul

diff --git a/app/views/admin/blogs/show.html.haml b/app/views/admin/blogs/show.html.haml
@@ -1,4 +1,3 @@
-- use_javascripts 'backbone/controllers/articles'
 %h2#title
   =link_to blog.title,blog_path(blog)
 #action-links

diff --git a/app/views/admin/comments/_comment.html.haml b/app/views/admin/comments/_comment.html.haml
@@ -1,4 +1,3 @@
--use_javascripts 'backbone/models/comment', 'backbone/views/comments/index', 'backbone/views/comments/show', 'backbone/controllers/comments'
 %table#comments-list.standard-table.hide_checkboxes{:cellpadding => "0", :cellspacing => "0"}
   %thead
     %tr

diff --git a/app/views/admin/comments/index.html.haml b/app/views/admin/comments/index.html.haml
@@ -1,4 +1,3 @@
--use_javascripts 'backbone/models/comment', 'backbone/views/comments/index', 'backbone/views/comments/show', 'backbone/controllers/comments'
 %h2#title 所 有 评 论
 #action-links
   %ul

diff --git a/app/views/admin/custom_collections/show.html.haml b/app/views/admin/custom_collections/show.html.haml
@@ -1,6 +1,4 @@
 - use_kindeditor
-=content_for :javascripts do
-  =javascript_include_tag 'backbone/views/custom_collections/product', 'backbone/views/custom_collections/products', 'backbone/views/custom_collections/available_product', 'backbone/views/custom_collections/available_products', 'backbone/models/product', 'backbone/models/custom_collection_product','backbone/controllers/custom_collections'
 
 %h2#title= link_to custom_collection.title, "/collection/#{custom_collection.handle}", title: '在网店中查看此页面', target: '_blank'
 #action-links

diff --git a/app/views/admin/customers/blank_slate.html.haml b/app/views/admin/customers/blank_slate.html.haml
@@ -1,6 +1,3 @@
-=content_for :javascripts do
-  =javascript_include_tag 'plugins/jquery.blank_slate'
-
 =render "menu"
 
 #blank-slate.blank-slate.clearfix.ppb

diff --git a/app/views/admin/customers/index.html.haml b/app/views/admin/customers/index.html.haml
@@ -1,6 +1,3 @@
-=content_for :javascripts do
-  =javascript_include_tag 'backbone/models/customer', 'backbone/models/customer_group', 'backbone/views/customers/index/index', 'backbone/views/customers/index/search', 'backbone/views/customers/index/filters/index', 'backbone/views/customers/index/filters/show', 'backbone/views/customers/index/show', 'backbone/views/customer_groups/index/index', 'backbone/views/customer_groups/index/show', 'backbone/controllers/customers/index'
-
 =render "menu"
 
 .clearfix.ppb(style="padding-bottom:40px;")

diff --git a/app/views/admin/customers/new.html.haml b/app/views/admin/customers/new.html.haml
@@ -1,6 +1,3 @@
-=content_for :javascripts do
-  =javascript_include_tag 'backbone/views/customers/new/index'
-
 %h2#title 新增顾客
 #action-links
   %ul

diff --git a/app/views/admin/customers/show.html.haml b/app/views/admin/customers/show.html.haml
@@ -1,6 +1,3 @@
-=content_for :javascripts do
-  =javascript_include_tag 'backbone/models/customer', 'backbone/models/order', 'backbone/views/customers/show/index', 'backbone/views/customers/show/show', 'backbone/views/customers/show/note', 'backbone/views/customers/show/tags', 'backbone/views/customers/show/edit', 'backbone/views/customers/show/orders/index', 'backbone/views/customers/show/orders/show'
-
 %h2#title
 #action-links
   %ul

diff --git a/app/views/admin/domains/index.html.haml b/app/views/admin/domains/index.html.haml
@@ -1,6 +1,3 @@
-=content_for :javascripts do
-  =javascript_include_tag 'backbone/views/domains/index'
-
 %h2#title DNS &amp; 域名
 =render "shared/noscript"
 =render "shared/upgrade_ie"

diff --git a/app/views/admin/emails/edit.html.haml b/app/views/admin/emails/edit.html.haml
@@ -1,4 +1,3 @@
--use_javascripts 'backbone/controllers/emails'
 %h2#title==编辑#{KeyValues::Mail::Type.find_by_code(email.mail_type).name}模板
 #action-links
   %ul

diff --git a/app/views/admin/emails/index.html.haml b/app/views/admin/emails/index.html.haml
@@ -1,4 +1,3 @@
--use_javascripts 'backbone/controllers/emails'
 %h2#title 邮件 &amp; 提醒
 #action-links
   %ul

diff --git a/app/views/admin/home/dashboard.html.haml b/app/views/admin/home/dashboard.html.haml
@@ -1,4 +1,3 @@
--use_javascripts 'backbone/controllers/users'
 %h2#title
 #action-links
   %ul

diff --git a/app/views/admin/link_lists/index.html.haml b/app/views/admin/link_lists/index.html.haml
@@ -1,6 +1,3 @@
-=content_for :javascripts do
-  =javascript_include_tag 'backbone/views/link_lists/links/index', 'backbone/views/link_lists/links/show', 'backbone/views/link_lists/links/new', 'backbone/views/link_lists/links/edit', 'backbone/views/link_lists/index', 'backbone/views/link_lists/show', 'backbone/views/link_lists/edit', 'backbone/views/link_lists/new', 'backbone/models/link','backbone/models/link_list'
-
 %h2#title 商店导航
 #action-links
   %ul

diff --git a/app/views/admin/orders/blank_slate.html.haml b/app/views/admin/orders/blank_slate.html.haml
@@ -1,6 +1,3 @@
-=content_for :javascripts do
-  =javascript_include_tag 'plugins/jquery.blank_slate'
-
 =render "menu"
 
 #blank-slate.blank-slate.clearfix.ppb

diff --git a/app/views/admin/orders/index.html.haml b/app/views/admin/orders/index.html.haml
@@ -1,6 +1,3 @@
-=content_for :javascripts do
-  =javascript_include_tag 'backbone/models/order','backbone/views/orders/index/index', 'backbone/views/orders/index/show', 'backbone/controllers/orders/index'
-
 =render "menu"
 
 #table-filters.box2.sst