Merge branch 'release/v1.2.0'

andyluss · May 1, 2015 · 2b4cdda · 2b4cdda
2 parents cc0f12e + 87df6db
commit 2b4cdda
Show file tree

Hide file tree

Showing 54 changed files with 658 additions and 82 deletions.
diff --git a/.meteor/packages b/.meteor/packages
@@ -63,4 +63,5 @@ meteorhacks:npm
 manuel:reactivearray
 http
 iron:url
-less
+less
+matteodem:easy-search
diff --git a/.meteor/versions b/.meteor/versions
@@ -75,6 +75,7 @@ [email protected]
 [email protected]
 manuel:[email protected]
 matb33:[email protected]
+matteodem:[email protected]
 mdg:[email protected]
 [email protected]
 [email protected]

diff --git a/lib/common/both/helpers.coffee b/lib/common/both/helpers.coffee
@@ -1,4 +1,4 @@
-@pq = (context)-> context.params.query
+@paramsQuery = (context)-> context.params.query
 
 @gbl = -> Meteor.isClient and window or global
 

diff --git a/lib/common/client/views/favorite_button.html b/lib/common/client/views/favorite_button.html
@@ -1,7 +1,7 @@
 <template name="favoriteButtonChecked">
-  <button class="favorite-button button button-clear button-light pull-right" doc="{{_id}}"><i class="icon ion-ios-star"></i></button>
+  <button class="favorite-button button button-clear button-light pull-right {{class}}" doc="{{_id}}"><i class="icon ion-ios-star"></i></button>
 </template>
 
 <template name="favoriteButtonNotChecked">
-  <button class="favorite-button button button-clear button-light pull-right" doc="{{_id}}" category="{{category}}"><i class="icon ion-ios-star-outline"></i></button>
+  <button class="favorite-button button button-clear button-light pull-right {{class}}" doc="{{_id}}" category="{{category}}"><i class="icon ion-ios-star-outline"></i></button>
 </template>
diff --git a/lib/common/client/views/favorite_button.import.styl b/lib/common/client/views/favorite_button.import.styl
diff --git a/lib/common/client/views/image_item.html b/lib/common/client/views/image_item.html
@@ -8,10 +8,12 @@
     {{/if}}
     <div class="title-container">
       <label class="title">{{title}}</label>
-      <label class="user">
+      <div class="banner">
+        <label class="user">
         {{userName user}}
-      </label>
-      <label class="date">{{dateString date}}</label>
+        </label>
+        <label class="date">{{dateString date}}</label>
+      </div>
     </div>
   </div>
 

diff --git a/lib/common/client/views/image_item.import.styl b/lib/common/client/views/image_item.import.styl
@@ -1,18 +1,47 @@
 .image-item
+  margin-bottom 10px
+  position relative
+  width 100%
+  height 240px
+  background-color #fff
+  box-shadow 0 2px 2px rgba(0,0,0,0.1)
+  z-index 1
   .image-container
     display flex
+    width 100%
+    height 205px
+    overflow hidden
     img
       margin auto
+      width 100%
   .title-container
-    padding-top 0.35em
+    position absolute
+    left 0
+    bottom 0
     size 100% 2em
-    background-color #a3ce5f
+    height 95px
+    background-color transparent
     label
-      color white
       position absolute
     .title
-      left 1em
-    .user
-      right 7em
-    .date
-      right 1em
+      position relative
+      display block
+      padding 8px 5%
+      width 100%
+      height 60px
+      color #fff
+      font-size 20px
+      line-height 22px
+      background-color rgba(0,0,0,0.4)
+    .banner
+      height 35px
+      background-color #fff
+      color #CBCBCB
+      .user,.date
+        position relative
+        display block
+        padding 0 15%
+        height 35px
+        width 50%
+        float left
+        line-height 35px
diff --git a/lib/common/client/views/layout_content.html b/lib/common/client/views/layout_content.html
@@ -8,7 +8,8 @@
       {{> yield}}
     {{/ionNavView}}
 
-    {{>photoswipe}}
+    {{> yield 'popup'}}
+
   {{/ionBody}}
 
 </template>
diff --git a/lib/common/client/views/tab_bar.html b/lib/common/client/views/tab_bar.html
@@ -8,7 +8,8 @@
 
         {{#unless user}}
           <button class="add-button button button-clear">
-            {{>ionIcon icon='plus-circled'}}
+            {{>ionIcon icon='dive-plus'}}
+              发布
           </button>
         {{/unless}}
 

diff --git a/lib/common/client/views/tab_bar.import.styl b/lib/common/client/views/tab_bar.import.styl
@@ -2,17 +2,46 @@
   .tabs
     background #36618e
     .tab-item
-      color #aadeff
-    .tab-item.active
+      opacity 1
       color white
+      font-family SimHei
+      line-height 12px
+      .icon
+        height 34px
+        filter brightness(0) invert(1)
+      .ion-dive-note
+        background url(/images/icondive-note.svg) no-repeat center
+        background-size 30px 30px
+      .ion-dive-journey
+        background url(/images/icondive-journey.svg) no-repeat center
+        background-size 30px 30px
+      .ion-dive-product
+        background url(/images/icondive-product.svg) no-repeat center
+        background-size 30px 30px
+      .ion-dive-say
+        background url(/images/icondive-say.svg) no-repeat center
+        background-size 30px 30px
+    .tab-item.active
+      color #2E5C8D
+      background-color #81BEFF
+      .icon
+        filter none
     .add-button
-      color #aadeff
       position absolute
       top 0
       left 0
       right 0
       margin auto
       padding 0
       width 50px
+      font-size 12px
+      line-height 12px
+      color #fff
+      .ion-dive-plus
+        display block
+        margin 0 auto
+        height 34px
+        background url(/images/icondive-add.svg) no-repeat center
+        background-size 32px 32px
       .icon:before
         font-size 50px
diff --git a/lib/post/both/collections.coffee b/lib/post/both/collections.coffee
@@ -1,5 +1,5 @@
 @createPostCollection = (category, hasCategory2)->
-  gbl()[pcap category] = new Meteor.Collection plural category
+  Posts = gbl()[pcap category] = new Meteor.Collection plural category
 
   moreSchema =
     category:
@@ -25,7 +25,7 @@
       autoform:
         options: options
 
-  coln(category).attachSchema new SimpleSchema [PostSchema, moreSchema]
+  Posts.attachSchema new SimpleSchema [PostSchema, moreSchema]
 
 @PostSchema = new SimpleSchema
 

diff --git a/lib/post/both/configs.coffee b/lib/post/both/configs.coffee
@@ -1,2 +1,2 @@
 @postConfigs =
-  autoFormOmitFields: ["category", "category2", "createdAt", "updatedAt", "user", "date", "images"]
+  autoFormOmitFields: ["category", "category2", "createdAt", "updatedAt", "user", "date", "images", "viewCount"]
diff --git a/lib/post/both/helpers.coffee b/lib/post/both/helpers.coffee
@@ -1,3 +1,6 @@
+
+@postCategoryLabel = (category)-> getConfigs(category).label or ''
+
 @autoFormOmitFields = (category)->
   omitFields = getConfigs(category).autoFormOmitFields
   if omitFields

diff --git a/lib/post/client/controllers.coffee b/lib/post/client/controllers.coffee
@@ -25,6 +25,8 @@
 @PostUpdaterController = ContentController.extend
   data: -> noTransition coln(pq(@).category).findOne({_id: pq(@).id})
 
+pq = (context)-> paramsQuery context
+
 getListItemTemplate = (selector)->
   cfg = getConfigs selector.category
   return cfg.itemTemplate[selector.category2] or cfg.itemTemplate

diff --git a/lib/post/client/helpers.coffee b/lib/post/client/helpers.coffee
@@ -0,0 +1 @@
+Template.registerHelper 'postCategoryLabel', (category)-> postCategoryLabel category
diff --git a/lib/post/client/views/creator.coffee b/lib/post/client/views/creator.coffee
@@ -12,7 +12,10 @@ Template.postCreator.helpers
 createAutoFormHooks = (data)->
   hooks =
     onSuccess: (formType, result)->
-      coln(data.category).update {_id: @docId}, {$set: {images: data.imagesToUpload.array()}}
+      coln(data.category).update {_id: @docId},
+        $set:
+          category2: data.category2
+          images: data.imagesToUpload.array()
       back()
   AutoForm.addHooks formId(data.category), hooks, true
 
diff --git a/lib/post/client/views/detail.html b/lib/post/client/views/detail.html
@@ -6,7 +6,7 @@
 
   {{#contentFor "headerButtonRight"}}
     {{#if currentUser}}
-      {{> favoriteButton _id=_id category=category}}
+      {{> favoriteButton _id=_id class='post-detail-favorite-button' category=category}}
     {{/if}}
     <button class="more-button button button-clear pull-right button-light ion-more icon" data-action="post-more"></button>
   {{/contentFor}}
@@ -15,6 +15,10 @@
     <h1 class="title">{{title}}</h1>
   {{/contentFor}}
 
+  {{#contentFor "popup"}}
+    {{>photoswipe}}
+  {{/contentFor}}
+
   {{#ionView}}
     {{#ionContent}}
 

diff --git a/lib/post/client/views/detail.import.styl b/lib/post/client/views/detail.import.styl
@@ -19,3 +19,8 @@
     opacity 0.6
 
   @import '../../../lib/common/client/views/comment_box.import.styl'
+
+.ionic-body
+  .nav-bar-block
+    .favorite-button.post-detail-favorite-button
+      right 2.5em
diff --git a/lib/post/client/views/list.coffee b/lib/post/client/views/list.coffee
@@ -25,9 +25,12 @@ Template.ionNavBar.events
     else
       Router.go '/login?from=list'
 
+  'click [data-action=search]': (event, template)->
+    Router.go "/search?type=#{@category}"
+
   'click [data-action=favoritesby]': (event, template)->
 #    setPostList 'favoritesby', myId()
     Router.go(currentPath() + "&favoritesby=#{myId()}")
 
 Template.postList.events
-  'click .category2': -> Router.go "/post/list?category=#{Template.parentData().category}&category2=#{@}"
+  'click .category2': -> Router.go "/post/list?category=#{Template.parentData().category}&category2=#{@}", {}, {replaceState: true}
diff --git a/lib/post/client/views/list.html b/lib/post/client/views/list.html
@@ -34,6 +34,9 @@ <h1 class="title">{{title}}</h1>
       {{/if}}
 
       {{#contentFor "headerButtonRight"}}
+        <button class="button button-clear pull-right button-light" data-action="search">
+          {{> ionIcon icon='ios-search'}}
+        </button>
         <button class="button button-clear pull-right button-light" data-action="my-data">
           {{> ionIcon icon='ios-person-outline'}}
         </button>

diff --git a/lib/post/client/views/list.import.styl b/lib/post/client/views/list.import.styl
@@ -15,4 +15,9 @@
         color #FFF
 
   @import '../../../lib/common/client/views/tab_bar.import.styl'
-  @import '../../../lib/post/client/views/list_loader.import.styl'
+  @import '../../../lib/post/client/views/list_loader.import.styl'
+
+.ionic-body
+  .nav-bar-block
+    [data-action="search"]
+      right 2.5em
diff --git a/lib/post/client/views/list_loader.import.styl b/lib/post/client/views/list_loader.import.styl
@@ -1,4 +1,5 @@
 .item-list
+  background-color #f7f7f7
   @import '../../../lib/common/client/views/image_item.import.styl'
 .loadmore-button
   margin 0

diff --git a/main/client/helpers.coffee b/main/client/helpers.coffee
@@ -0,0 +1 @@
+Template.registerHelper 'postCategories', -> _.values PostCategory
diff --git a/main/client/views/main.html b/main/client/views/main.html
@@ -1,32 +1,6 @@
 <head>
   <title>潜水吧</title>
   <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no">
-
-    <!--<link rel="apple-touch-icon" sizes="57x57" href="/apple-touch-icon-57x57.png?v=2">-->
-    <!--<link rel="apple-touch-icon" sizes="114x114" href="/apple-touch-icon-114x114.png?v=2">-->
-    <!--<link rel="apple-touch-icon" sizes="72x72" href="/apple-touch-icon-72x72.png?v=2">-->
-    <!--<link rel="apple-touch-icon" sizes="144x144" href="/apple-touch-icon-144x144.png?v=2">-->
-    <!--<link rel="apple-touch-icon" sizes="60x60" href="/apple-touch-icon-60x60.png?v=2">-->
-    <!--<link rel="apple-touch-icon" sizes="120x120" href="/apple-touch-icon-120x120.png?v=2">-->
-    <!--<link rel="apple-touch-icon" sizes="76x76" href="/apple-touch-icon-76x76.png?v=2">-->
-    <!--<link rel="apple-touch-icon" sizes="152x152" href="/apple-touch-icon-152x152.png?v=2">-->
-    <!--<link rel="apple-touch-icon" sizes="180x180" href="/apple-touch-icon-180x180.png?v=2">-->
-    <!--<link rel="icon" type="image/png" href="/favicon-192x192.png?v=2" sizes="192x192">-->
-    <!--<link rel="icon" type="image/png" href="/favicon-160x160.png?v=2" sizes="160x160">-->
-    <!--<link rel="icon" type="image/png" href="/favicon-96x96.png?v=2" sizes="96x96">-->
-    <!--<link rel="icon" type="image/png" href="/favicon-16x16.png?v=2" sizes="16x16">-->
-    <!--<link rel="icon" type="image/png" href="/favicon-32x32.png?v=2" sizes="32x32">-->
-
-    <!--<meta name="msapplication-TileColor" content="#ffffff">-->
-    <!--<meta name="msapplication-TileImage" content="/mstile-144x144.png?v=2">-->
-
-    <!--<meta name="theme-color" content="#DE4F4F" />-->
-    <!--<meta name="mobile-web-app-capable" content="yes">-->
-
-    <!--<meta name="apple-mobile-web-app-capable" content="yes">-->
-    <!--<meta name="apple-mobile-web-app-title" content="Meteor Hunt">-->
-    <!--<meta name="apple-mobile-web-app-status-bar-style" content="black-translucent">-->
-
 </head>
 
 <body>

diff --git a/main/client/views/main.styl b/main/client/views/main.styl
@@ -10,8 +10,9 @@
 
 @require '../../../modules/journey/client/views/main.import.styl'
 @require '../../../modules/product/client/views/main.import.styl'
+@require '../../../modules/say/client/views/main.import.styl'
 
-@require '../../../lib/common/client/views/favorite_button.import.styl'
+@require '../../../modules/search/client/views/main.import.styl'
 
 a
   color inherit

diff --git a/modules/houston/server/houston.coffee b/modules/houston/server/houston.coffee
@@ -2,6 +2,6 @@ Meteor.startup ->
   Houston.add_collection Users
   Houston.add_collection Houston._admins
 
-  Houston.add_collection Favorites
-  Houston.add_collection Comments._collection
+  global['Favorites'] and Houston.add_collection Favorites
+  global['Comments'] and Houston.add_collection Comments._collection
 
diff --git a/modules/journey/both/lib/configs.coffee b/modules/journey/both/lib/configs.coffee
@@ -1,6 +1,6 @@
 @journeyConfigs =
   label: '行程'
-  icon: "plane"
+  icon: "dive-journey"
   category2:
     official: 'official'
     user: 'user'

diff --git a/modules/mongol/client/configs.coffee b/modules/mongol/client/configs.coffee
@@ -0,0 +1,5 @@
+Session.set "Mongol",
+  'collections': ['Notes', 'Journeys', 'Products', 'Says']
+  'display': false
+  'opacity_normal': ".7"
+  'opacity_expand': ".9"
diff --git a/modules/note/both/lib/configs.coffee b/modules/note/both/lib/configs.coffee
@@ -1,4 +1,4 @@
 @noteConfigs =
-  label: '游记'
+  label: '潜途'
   itemTemplate: 'imageItem'
-  icon: "android-car"
+  icon: "dive-note"