Merge branch 'master' into social

* master:
  Fixing iphone page by moving JS to bottom of page.
  Adding Nokia MeeGo Web Feeds mobile app.

media/css/reader.css

@@ -6224,6 +6224,13 @@ background: transparent;
   margin: 0 6px 0 0;
   background: transparent url('/media/embed/mobile/android.png') no-repeat 0 0;
 }
+.NB-modal-goodies .NB-goodies-nokia {
+  float: right;
+  width: 28px;
+  height: 28px;
+  margin: 0 6px 0 0;
+  background: transparent url('/media/embed/mobile/nokia.png') no-repeat 0 0;
+}
 
 /* ============================ */
 /* = Keyboard Shortcuts Modal = */

media/js/newsblur/reader/reader_goodies.js

@@ -86,6 +86,14 @@ NEWSBLUR.ReaderGoodies.prototype = {
               }, 'View in Android Market'),
               $.make('div', { className: 'NB-goodies-android' }),
               $.make('div', { className: 'NB-goodies-title' }, 'Blar: User-Created Android App')
+            ]),
+            $.make('div', { className: 'NB-goodies-group NB-modal-submit' }, [
+              $.make('a', {
+                  className: 'NB-goodies-mobile-link NB-modal-submit-button NB-modal-submit-green',
+                  href: 'http://projects.developer.nokia.com/feed_reader'
+              }, 'View in Nokia Store'),
+              $.make('div', { className: 'NB-goodies-nokia' }),
+              $.make('div', { className: 'NB-goodies-title' }, 'Web Feeds: User-Created MeeGo App')
             ])
         ]);
     },

templates/reader/feeds.xhtml

@@ -433,7 +433,7 @@
                 <a href="/iphone/" class="NB-splash-link">See the free NewsBlur iPhone App</a>
             </div>
           </div>
-          <div class="NB-module-item NB-last {% if user_profile.hide_mobile %}NB-hidden{% endif %}">
+          <div class="NB-module-item {% if user_profile.hide_mobile %}NB-hidden{% endif %}">
             <div class="NB-module-mobile-image">
                 <img src="{{ MEDIA_URL }}/img/mobile/android-icon-blar.png" />
             </div>
@@ -449,6 +449,22 @@
                 <a href="https://market.android.com/details?id=bitwrit.Blar" class="NB-splash-link">Download Blar on the Android Market</a>
             </div>
           </div>
+          <div class="NB-module-item NB-last {% if user_profile.hide_mobile %}NB-hidden{% endif %}">
+            <div class="NB-module-mobile-image">
+                <img src="{{ MEDIA_URL }}/img/mobile/meego-icon-webfeeds.png" />
+            </div>
+            <h3 class="NB-module-content-header">
+                <span class="NB-module-content-subtitle">
+                  User-Built Client
+                </span>
+                <div class="NB-module-mobile-title">Web Feeds</div>
+                <div class="NB-module-mobile-device">Nokia MeeGo</div>
+            </h3>
+            <div class="NB-module-item-title">
+                <span class="NB-raquo">&raquo;</span>
+                <a href="http://projects.developer.nokia.com/feed_reader" class="NB-splash-link">Download Web Feeds on the Nokia Store</a>
+            </div>
+          </div>
         </div>
       {% endif %}
       

templates/static/iphone.xhtml

@@ -74,6 +74,10 @@
 
   </div>
 
+{% endblock content %}
+
+
+{% block extra_head_js %}
 <script>
 $(document).ready(function() {
     var $features = $('.NB-iphone-main .NB-iphone-feature');
@@ -146,4 +150,4 @@ $(document).ready(function() {
     
 });
 </script>
-{% endblock content %}
+{% endblock %}