Update version

Make custom columns visible (#904)

cps/static/js/caliBlur.js

@@ -58,8 +58,8 @@ $( 'a.navbar-brand' ).clone().appendTo( '.home-btn' ).empty().removeClass('navba
 if ( $( 'body.book' ).length > 0 ) {
 
   description = $( '.comments' );
-  bookInfo = $( '.author' ).nextUntil( 'h3:contains("Description")');
+  bookInfo = $( ".author" ).nextUntil("#decription");
-  $( 'h3:contains("Description")' ).detach();
+  $("#decription").detach();
   $( '.comments' ).detach();
   $( bookInfo ).wrapAll( '<div class="bookinfo"></div>' );
 //  $( 'h3:contains("Description:")' ).after( '<div class="description"></div>' );
@@ -145,14 +145,29 @@ if ( $( 'body.book' ).length > 0 ) {
     .prepend( '<div><img class="bg-blur" src="' + cover + '"></div>' );
 
   // Fix-up book detail headings
-publisher = $( '.publishers p span' ).text().split( ':' );
+  publisher = $( '.publishers p span' ).text().split( ':' );
-  $( '.publishers p span' ).remove();
+    $( '.publishers p span' ).remove();
-  $.each(publisher, function(i, val) {
+    $.each(publisher, function(i, val) {
-    $( '.publishers' ).append( '<span>' + publisher[i] + '</span>' );
+      $( '.publishers' ).append( '<span>' + publisher[i] + '</span>' );
+    });
+  $( '.publishers span:nth-child(3)' ).text(function() {
+  return $(this).text().replace(/^\s+|^\t+|\t+|\s+$/g, "");
   });
-$( '.publishers span:nth-child(3)' ).text(function() {
+
-return $(this).text().replace(/^\s+|^\t+|\t+|\s+$/g, "");
+  // Fix-up book custom colums headings
-});
+  // real_custom_column = $( '.real_custom_columns' ).text().split( ':' );
+  real_custom_column = $( '.real_custom_columns' );
+    // $( '.real_custom_columns' ).remove();
+    $.each(real_custom_column, function(i, val) {
+        real_cc = $(this).text().split( ':' );
+        $( this ).text("");
+        if (real_cc.length > 1) {
+            $( this ).append( '<span>' + real_cc[0] + '</span><span>' + real_cc[1] + '</span>' );
+        }
+    });
+  //$( '.real_custom_columns:nth-child(3)' ).text(function() {
+  //return $(this).text().replace(/^\s+|^\t+|\t+|\s+$/g, "");
+  //});
 
   published = $( '.publishing-date p' )
   .text().split(': ');

cps/templates/detail.html

@@ -150,9 +150,9 @@
       {% endif %}
       {% if cc|length > 0 %}
 
-        <div class="custom_columns">
+
-        <p>
         {% for c in cc %}
+        <div class="real_custom_columns">
           {% if entry['custom_column_' ~ c.id]|length > 0 %}
             {{ c.name }}:
             {% for column in entry['custom_column_' ~ c.id] %}
@@ -170,11 +170,9 @@
                 {% endif %}
               {% endif %}
             {% endfor %}
-            <br />
           {% endif %}
-        {% endfor %}
-        </p>
         </div>
+        {% endfor %}
       {% endif %}
       {% if not g.user.is_anonymous %}
 
@@ -193,7 +191,7 @@
 
       {% if entry.comments|length > 0 and entry.comments[0].text|length > 0%}
         <div class="comments">
-            <h3>{{_('Description:')}}</h3>
+            <h3 id="decription">{{_('Description:')}}</h3>
             {{entry.comments[0].text|safe}}
         </div>
       {% endif %}

cps/updater.py

@@ -237,7 +237,7 @@ class Updater(threading.Thread):
         return False
 
     def _stable_version_info(self):
-        return {'version': '0.6.3'} # Current version
+        return {'version': '0.6.4 Beta'} # Current version
 
     def _nightly_available_updates(self, request_method):
         tz = datetime.timedelta(seconds=time.timezone if (time.localtime().tm_isdst == 0) else time.altzone)