Merge remote-tracking branch 'tags_restrict/master' into Develop

cps/templates/config_edit.html

@@ -71,7 +71,7 @@
       </div>
     </div>
   </div>
-
+    {% if show_back_button %}
   <div class="panel panel-default">
     <div class="panel-heading">
       <h4 class="panel-title">
@@ -316,11 +316,14 @@
       </div>
     </div>
   </div>
+  {% endif %}
 </div>
 
 
     <div class="col-sm-12">
+    {% if not show_login_button %}
     <button type="submit" name="submit" class="btn btn-default">{{_('Submit')}}</button>
+    {% endif %}
     {% if show_back_button %}
       <a href="{{ url_for('admin.admin') }}" class="btn btn-default">{{_('Back')}}</a>
     {% endif %}

cps/templates/config_view_edit.html

@@ -51,16 +51,19 @@
                 {% endfor %}
               </select>
         </div>
+        <div class="form-group">
+          <label for="config_restricted_column">{{_('View restriction based on Calibre column')}}</label>
+              <select name="config_restricted_column" id="config_restricted_column" class="form-control">
+                <option value="0" {% if conf.config_restricted_column == 0 %}selected{% endif %}>{{ _('None') }}</option>
+                {%  for restrictColumn in restrictColumns %}
+                <option value="{{ restrictColumn.id }}" {% if restrictColumn.id == conf.config_restricted_column %}selected{% endif %}>{{ restrictColumn.name }}</option>
+                {% endfor %}
+              </select>
+        </div>
         <div class="form-group">
           <label for="config_title_regex">{{_('Regular expression for title sorting')}}</label>
           <input type="text" class="form-control" name="config_title_regex" id="config_title_regex" value="{% if conf.config_title_regex != None %}{{ conf.config_title_regex }}{% endif %}" autocomplete="off">
         </div>
-        <div class="form-group">
-          <label for="config_mature_content_tags">{{_('Tags for Mature Content')}}</label>
-          <input type="text" class="form-control" name="config_mature_content_tags" id="config_mature_content_tags"
-                 value="{% if conf.config_mature_content_tags != None%}{{ conf.config_mature_content_tags }}{% endif %}"
-                 autocomplete="off"
-          >
         </div>
       </div>
     </div>
@@ -108,6 +111,14 @@
           <input type="checkbox" name="edit_shelf_role" id="edit_shelf_role" {% if conf.role_edit_shelfs() %}checked{% endif %}>
           <label for="edit_shelf_role">{{_('Allow Editing Public Shelfs')}}</label>
         </div>
+        <div class="form-group">
+            <label for="config_restricted_tags">{{_('Restrict Tags')}}</label>
+            <input type="text" class="form-control" name="config_restricted_tags" id="config_restricted_tags" value="{{ conf.config_restricted_tags if conf.config_restricted_tags != None }}" autocomplete="off">
+        </div>
+        <div class="form-group">
+            <label for="config_restricted_column_value">{{_('Restricted Column Content')}}</label>
+            <input type="text" class="form-control" name="config_restricted_column_value" id="config_restricted_column_value" value="{{ conf.config_restricted_column_value if conf.config_restricted_column_value != None }}" autocomplete="off">
+        </div>
       </div>
     </div>
   </div>
@@ -134,14 +145,9 @@
             <input type="checkbox" name="Show_detail_random" id="Show_detail_random" {% if conf.show_detail_random() %}checked{% endif %}>
             <label for="Show_detail_random">{{_('Show random books in detail view')}}</label>
         </div>
-        <div class="form-group">
-            <input type="checkbox" name="Show_mature_content" id="Show_mature_content" {% if conf.show_mature_content() %}checked{% endif %}>
-            <label for="Show_mature_content">{{_('Show mature content')}}</label>
-        </div>
       </div>
     </div>
   </div>
-</div>
     <div class="col-sm-12">
     <button type="submit" name="submit" class="btn btn-default">{{_('Submit')}}</button>
     <a href="{{ url_for('admin.admin') }}" class="btn btn-default">{{_('Back')}}</a>

cps/templates/user_edit.html

@@ -14,9 +14,9 @@
       <input type="email" class="form-control" name="email" id="email" value="{{ content.email if content.email != None }}" autocomplete="off">
     </div>
     {% if ( g.user and g.user.role_passwd() or g.user.role_admin() ) and not content.role_anonymous() %}
-      {% if g.user and g.user.role_admin() and g.allow_registration and not new_user and not profile %}
-        <div class="btn btn-default" id="resend_password"><a href="{{url_for('admin.reset_password', user_id = content.id) }}">{{_('Reset user Password')}}</a></div>
-      {% else %}
+      {% if g.user and g.user.role_admin() and not new_user and not profile and ( mail_configured and content.email if content.email != None ) %}
+        <div class="btn btn-default" id="resend_password"><a href="{{url_for('admin.reset_user_password', user_id = content.id) }}">{{_('Reset user Password')}}</a></div>
+      {% endif %}
         <div class="form-group">
           <label for="password">{{_('Password')}}</label>
           <input type="password" class="form-control" name="password" id="password" value="" autocomplete="off">
@@ -39,7 +39,14 @@
             {% endfor %}
         </select>
     </div>
-
+    <div class="form-group">
+        <label for="restricted_tags">{{_('Restricted Tags')}}</label>
+        <input type="text" class="form-control" name="restricted_tags" id="restricted_tags" value="{{ content.restricted_tags if content.restricted_tags != None }}" autocomplete="off">
+    </div>
+    <div class="form-group">
+        <label for="restricted_column_value">{{_('Restricted Column Content')}}</label>
+        <input type="text" class="form-control" name="restricted_column_value" id="restricted_column_value" value="{{ content.restricted_column_value if content.restricted_column_value != None }}" autocomplete="off">
+    </div>
     <div class="form-group">
       <label for="default_language">{{_('Show books with language')}}</label>
         <select name="default_language" id="default_language" class="form-control">
@@ -49,7 +56,6 @@
             {% endfor %}
         </select>
     </div>
-
     {% if registered_oauth.keys()| length > 0 %}
       {% for id, name in registered_oauth.items() %}
     <div class="form-group">
@@ -61,9 +67,7 @@
         {% endif %}
       {% endfor %}
     </div>
-
     {% endif %}
-
     <div class="col-sm-6">
         {% for element in sidebar %}
           {% if element['config_show'] %}
@@ -87,10 +91,10 @@
       <label for="admin_role">{{_('Admin user')}}</label>
     </div>
     {% endif %}
-    <div class="form-group">
+    <!--div class="form-group">
         <input type="checkbox" name="Show_mature_content" id="Show_mature_content" {% if content.mature_content %}checked{% endif %}>
         <label for="Show_mature_content">{{_('Show mature content')}}</label>
-    </div>
+    </div-->
     <div class="form-group">
       <input type="checkbox" name="download_role" id="download_role" {% if content.role_download() %}checked{% endif %}>
       <label for="download_role">{{_('Allow Downloads')}}</label>