Update Teststatus

cps/admin.py

@@ -529,7 +529,7 @@ def new_user():
             content.locale = to_save["locale"]
 
         val = 0
-        for key, _ in to_save.items():
+        for key, __ in to_save.items():
             if key.startswith('show'):
                 val += int(key[5:])
         content.sidebar_view = val

cps/subproc_wrapper.py

@@ -37,6 +37,7 @@ def process_open(command, quotes=(), env=None, sout=subprocess.PIPE):
     else:
         if sys.version_info < (3, 0):
             exc_command = [x.encode(sys.getfilesystemencoding()) for x in command]
+        else:
+            exc_command = [x for x in command]
 
-    # return subprocess.Popen(exc_command, shell=False, stdout=subprocess.PIPE, universal_newlines=True, env=env)
     return subprocess.Popen(exc_command, shell=False, stdout=sout, universal_newlines=True, env=env)

cps/templates/config_view_edit.html

@@ -119,10 +119,12 @@
     <div id="collapseseven" class="panel-collapse collapse">
       <div class="panel-body">
         {% for element in sidebar %}
-          <div class="form-group">
+          {% if element['config_show'] %}
+            <div class="form-group">
               <input type="checkbox" name="show_{{element['visibility']}}" id="show_{{element['visibility']}}" {% if conf.show_element_new_user(element['visibility']) %}checked{% endif %}>
               <label for="show_{{element['visibility']}}">{{element['show_text']}}</label>
-          </div>
+            </div>
+          {% endif %}
         {% endfor %}
         <div class="form-group">
             <input type="checkbox" name="Show_detail_random" id="Show_detail_random" {% if conf.show_detail_random() %}checked{% endif %}>

cps/templates/detail.html

@@ -117,7 +117,7 @@
       {% endif %}
 
       {% if entry.series|length > 0 %}
-        <p>{{_('Book')}} {{entry.series_index}} {{_('of')}} <a href="{{url_for('web.series', book_id=entry.series[0].id)}}">{{entry.series[0].name}}</a></p>
+        <p>{{_('Book')}} {{entry.series_index}} {{_('of')}} <a href="{{url_for('web.books_list', data='series',sort='abc', book_id=entry.series[0].id)}}">{{entry.series[0].name}}</a></p>
       {% endif %}
 
       {% if entry.languages.__len__() > 0 %}
@@ -157,7 +157,7 @@
       <div class="publishers">
         <p>
           <span>{{_('Publisher')}}:
-              <a href="{{url_for('web.publisher', book_id=entry.publishers[0].id ) }}">{{entry.publishers[0].name}}</a>
+              <a href="{{url_for('web.books_list', data='publisher', sort='new', book_id=entry.publishers[0].id ) }}">{{entry.publishers[0].name}}</a>
           </span>
         </p>
       </div>

cps/templates/index.html

@@ -4,7 +4,7 @@
 <div class="discover random-books">
   <h2 class="random-books">{{_('Discover (Random Books)')}}</h2>
   <div class="row">
-web.    {% for entry in random %}
+   {% for entry in random %}
     <div class="col-sm-3 col-lg-2 col-xs-6 book" id="books_rand">
       <div class="cover">
           <a href="{{ url_for('web.show_book', book_id=entry.id) }}" data-toggle="modal" data-target="#bookDetailsModal" data-remote="false">

cps/ub.py

@@ -105,7 +105,7 @@ def get_sidebar_config(kwargs=None):
         else:
             content = False
     else:
-        content = False
+        content = 'conf' in kwargs
     sidebar = list()
     sidebar.append({"glyph": "glyphicon-book", "text": _('Recently Added'), "link": 'web.index', "id": "new",
                     "visibility": SIDEBAR_RECENT, 'public': True, "page": "root",

cps/web.py

@@ -1209,7 +1209,6 @@ def token_verified():
 @web.route("/me", methods=["GET", "POST"])
 @login_required
 def profile():
-    global _
     downloads = list()
     languages = speaking_language()
     translations = babel.list_translations() + [LC('en')]
@@ -1248,7 +1247,7 @@ def profile():
             current_user.locale = to_save["locale"]
 
         val = 0
-        for key, _ in to_save.items():
+        for key, __ in to_save.items():
             if key.startswith('show'):
                 val += int(key[5:])
         current_user.sidebar_view = val