Browse Source

Add an embed type to sponsor's display to use for AdSense codes

Markus Ochel 12 năm trước cách đây
mục cha
commit
da833d0a4b

+ 1 - 2
admin/controllers/index.coffee

@@ -124,8 +124,7 @@ class App extends Spine.Controller
 
   doOtherStuff: ->
     # Use the fastclick module for touch devices.
-    # Add a class of `needsclick` if the original click
-    # is needed.
+    # Add a class of `needsclick` if the original click is needed.
     new FastClick(document.body)
 
     # Alert user when leaving the application.

+ 1 - 1
admin/static/css/theme.styl

@@ -651,7 +651,7 @@ span.label
       .count
         float: right
 
-    > .list
+    > ul.list
       margin-bottom: 2em
 
 

+ 1 - 0
admin/templates/sponsor-form.html

@@ -21,6 +21,7 @@
           <option value="text">Text</option>
           <option value="image">Image</option>
           <option value="video">Video</option>
+          <option value="embed">Embed</option>
         </select>
       </div>
       <div class="field-right">

+ 0 - 6
site/server/lists.coffee

@@ -103,9 +103,6 @@ exports.collection = (head, req) ->
     now = moment.utc()
     if sponsor_start.diff(now) <= 0 and sponsor_end.diff(now) >= 0
       # let's continue on
-      sponsor.text_format = sponsor.format is 'text'
-      sponsor.image_format = sponsor.format is 'image'
-      sponsor.video_format = sponsor.format is 'video'
       sponsor.for_type = collection.type
       sponsor.for_type_tc = collection.type_tc
     else
@@ -252,9 +249,6 @@ exports.doc = (head, req) ->
     now = moment.utc()
     if sponsor_start.diff(now) <= 0 and sponsor_end.diff(now) >= 0
       # let continue on
-      sponsor.text_format = sponsor.format is 'text'
-      sponsor.image_format = sponsor.format is 'image'
-      sponsor.video_format = sponsor.format is 'video'
       sponsor.for_type = doc.type
       sponsor.for_type_tc = doc.type_tc
     else

+ 1 - 1
site/templates/collections.html

@@ -1,5 +1,5 @@
 {{#if collections}}
-<section class="collections">
+<section class="collections" id="collections">
   <h3>The Collections</h3>
 
   <ul>

+ 11 - 7
site/templates/partials/sponsor.html

@@ -8,18 +8,18 @@
       {{/if}}
     </div>
 
-    {{#if sponsor.text_format}}
+    {{#ifequal sponsor.format "text"}}
     <div class="name">
       {{#if sponsor.link}}
-        <a href="{{sponsor.link}}">{{{sponsor.name}}}</a>
+        <a href="{{sponsor.link}}" >{{{sponsor.name}}}</a>
       {{else}}
         {{{sponsor.name}}}
       {{/if}}
     </div>
     <div class="content">{{{sponsor.content}}}</div>
-    {{/if}}
+    {{/ifequal}}
 
-    {{#if sponsor.image_format}}
+    {{#ifequal sponsor.format "image"}}
     <div class="image">
       {{#if sponsor.link}}
         <a href="{{sponsor.link}}" target="_blank"><img src="{{#if sponsor.image}}{{sponsor.image}}{{else}}{{sponsor.content}}{{/if}}" alt=""></a>
@@ -27,10 +27,14 @@
         <img src="{{#if sponsor.image}}{{sponsor.image}}{{else}}{{sponsor.content}}{{/if}}" alt="">
       {{/if}}
     </div>
-    {{/if}}
+    {{/ifequal}}
 
-    {{#if sponsor.video_format}}
+    {{#ifequal sponsor.format "video"}}
     <div class="video">{{{sponsor.content}}}</div>
-    {{/if}}
+    {{/ifequal}}
+
+    {{#ifequal sponsor.format "embed"}}
+    <div class="content">{{{sponsor.content}}}</div>
+    {{/ifequal}}
   </section>
   {{/if}}