Merge branch 'master' of github.com:kylewm/woodwind

requirements.txt

@@ -10,9 +10,9 @@ Werkzeug==0.10.4
 asyncio-redis==0.13.4
 beautifulsoup4==4.3.2
 bleach==1.4.1
-feedparser>=5.2.0
+feedparser==5.2.1
 html5lib==0.99999
-mf2py==0.2.7
+mf2py==1.0.2
 mf2util==0.2.6
 psycopg2==2.6
 pyOpenSSL==0.15.1
@@ -22,3 +22,4 @@ requests==2.7.0
 rq==0.5.2
 uWSGI==2.0.10
 websockets==2.4
+pyquerystring==1.0.2

woodwind/static/feed.js

@@ -67,15 +67,10 @@ $(function(){
     function attachListeners() {
         $("#older-link").off('click').click(clickOlderLink);
         $(".micropub-form button[type='submit']").off('click').click(submitMicropubForm);
-        $(".reply-area.closed").hide();
 
-        $("article").off('click').click(function(evt) {
+        $(".micropub-form .content").focus(function () {
+            $(this).animate({ height: "4em" }, 200);
             var $target = $(evt.target);
-            if ($target.closest("form, a, video, audio").length == 0) {
-
-                $(".reply-area", this).toggleClass("closed");
-                $(".reply-area", this).slideToggle(200);
-            }
         });
     }
 

woodwind/static/style.css

@@ -502,21 +502,24 @@ button {
   vertical-align: middle; }
 
 .syndication-toggle {
-  display: inline-block;
+  display: block;
   margin-top: 0.25em;
-  height: 32px;
+  overflow: visible; }
-  width: 32px; }
   .syndication-toggle input {
     display: none; }
   .syndication-toggle label {
     display: inline-block;
     vertical-align: middle;
-    height: 16px;
-    width: 16px;
     padding: 4px;
     border-radius: 3px;
     background-color: #eee;
     margin: 0;
+    width: 240px;
+    text-align: left;
+    font-weight: normal;
+    font-size: 0.8em;
+    overflow: visible;
+    white-space: nowrap;
     color: #666;
     cursor: pointer; }
     .syndication-toggle label img {
@@ -529,8 +532,6 @@ button {
 .reply-area {
   text-align: center;
   margin-top: 0.5em; }
-  .reply-area .content {
-    height: 4em; }
   .reply-area .reply-link {
     display: inline-block;
     padding: 0.2em;

woodwind/static/style.scss

@@ -210,10 +210,9 @@ button {
 }
 
 .syndication-toggle {
-    display: inline-block;
+    display: block;
     margin-top: 0.25em;
-    height: 32px;
+    overflow: visible;
-    width: 32px;
 
     input {
         display: none;
@@ -222,12 +221,17 @@ button {
     label {
         display: inline-block;
         vertical-align: middle;
-        height: 16px;
-        width: 16px;
         padding: 4px;
         border-radius: 3px;
         background-color: #eee;
         margin: 0;
+        width: 240px;
+        text-align: left;
+
+        font-weight: normal;
+        font-size: 0.8em;
+        overflow: visible;
+        white-space: nowrap;
 
         color: #666;
         cursor: pointer;
@@ -248,10 +252,6 @@ button {
 .reply-area {
     text-align: center;
     margin-top: 0.5em;
-    
-    .content {
-        height: 4em;
-    }    
 
     .reply-link {
         display: inline-block;

woodwind/templates/_reply.jinja2

@@ -14,7 +14,7 @@
       {% for target in current_user.get_setting('syndicate-to', []) %}
         <div class="syndication-toggle">
           <input id="sc-{{entry.id}}-{{loop.index}}" type="checkbox" name="syndicate-to[]" value="{{ target }}"{% if entry is syndicated_to(target) %} checked{% endif %} />
-          <label for="sc-{{entry.id}}-{{loop.index}}"><img src="{{ target | favicon_for_url }}" alt="{{ target }}" /></label>
+          <label for="sc-{{entry.id}}-{{loop.index}}"><img src="{{ target | favicon_for_url }}" alt="{{ target }}" />&nbsp;{{ target | prettify_url }}</label>
         </div>
       {% endfor %}
     </div>

woodwind/templates/base.jinja2

@@ -8,7 +8,7 @@
   <link rel="shortcut icon" href="{{ url_for('static', filename='logo.png') }}"/>
   <link rel="apple-touch-icon" href="{{ url_for('static', filename='logo.png') }}"/>
 
-  <link rel="stylesheet" href="{{ url_for('static', filename='style.css', version='2015-11-25') }}"/>
+  <link rel="stylesheet" href="{{ url_for('static', filename='style.css', version='2015-12-24') }}"/>
   <link rel="stylesheet" href="//maxcdn.bootstrapcdn.com/font-awesome/4.3.0/css/font-awesome.min.css"/>
   <script src="//code.jquery.com/jquery-2.1.3.min.js"></script>
   <script src="{{ url_for('static', filename='moment.min.js') }}"></script>

woodwind/templates/feed.jinja2

@@ -4,7 +4,7 @@
   {% if ws_topic %}
     <script>var WS_TOPIC = "{{ ws_topic }}";</script>
   {% endif %}
-  <script src="{{url_for('static', filename='feed.js', version='2015-11-06')}}"></script>
+  <script src="{{url_for('static', filename='feed.js', version='2015-12-24')}}"></script>
 
   {% if current_user and current_user.settings
         and current_user.settings.get('reply-method') == 'indie-config' %}