Merge remote-tracking branch 'google_site_verification/master'

cps/admin.py

@@ -108,6 +108,7 @@ def before_request():
         logout_user()
     g.constants = constants
     g.user = current_user
+    g.google_site_verification = os.getenv('GOOGLE_SITE_VERIFICATION','')
     g.allow_registration = config.config_public_reg
     g.allow_anonymous = config.config_anonbrowse
     g.allow_upload = config.config_uploading

cps/templates/http_error.html

@@ -6,6 +6,9 @@
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
     <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
     <meta name="apple-mobile-web-app-capable" content="yes">
+    {% if g.google_site_verification|length > 0 %}
+      <meta name="google-site-verification" content='{{g.google_site_verification}}' />
+    {% endif %}    
 
     <!-- Bootstrap -->
     <link rel="apple-touch-icon" sizes="140x140" href="{{ url_for('static', filename='favicon.ico') }}">

cps/templates/layout.html

@@ -8,6 +8,9 @@
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
     <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
     <meta name="apple-mobile-web-app-capable" content="yes">
+    {% if g.google_site_verification|length > 0 %}
+      <meta name="google-site-verification" content='{{g.google_site_verification}}' />
+    {% endif %}
 
     <!-- Bootstrap -->
     <link rel="apple-touch-icon" sizes="140x140" href="{{ url_for('static', filename='favicon.ico') }}">

cps/templates/listenmp3.html

@@ -8,6 +8,9 @@
   <meta name="description" content="">
   <meta name="viewport" content="width=device-width">
   <meta name="apple-mobile-web-app-capable" content="yes">
+  {% if g.google_site_verification|length > 0 %}
+    <meta name="google-site-verification" content='{{g.google_site_verification}}' />
+  {% endif %}  
 
   <script src="{{ url_for('static', filename='js/libs/jquery.min.js') }}"></script>
   <script src="{{ url_for('static', filename='js/libs/soundmanager2.js') }}"></script>

cps/templates/read.html

@@ -7,6 +7,9 @@
         <meta name="description" content="">
         <meta name="viewport" content="width=device-width, user-scalable=no">
         <meta name="apple-mobile-web-app-capable" content="yes">
+        {% if g.google_site_verification|length > 0 %}
+          <meta name="google-site-verification" content='{{g.google_site_verification}}' />
+        {% endif %}          
         <link rel="apple-touch-icon" sizes="140x140" href="{{ url_for('static', filename='favicon.ico') }}">
         <link rel="shortcut icon" href="{{ url_for('static', filename='favicon.ico') }}">
 

cps/templates/readcbr.html

@@ -7,6 +7,9 @@
   <title>{{_('Comic Reader')}} | {{title}}</title>
   <meta name="viewport" content="width=device-width, user-scalable=no">
   <meta name="apple-mobile-web-app-capable" content="yes">
+  {% if g.google_site_verification|length > 0 %}
+    <meta name="google-site-verification" content='{{g.google_site_verification}}' />
+  {% endif %}    
 
   <link rel="stylesheet" href="{{ url_for('static', filename='css/libs/normalize.css') }}">
   <link rel="stylesheet" href="{{ url_for('static', filename='css/main.css') }}" type="text/css"/>

cps/templates/readdjvu.html

@@ -6,6 +6,10 @@
     <meta name="description" content="">
     <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no">
     <meta name="apple-mobile-web-app-capable" content="yes">
+    {% if g.google_site_verification|length > 0 %}
+      <meta name="google-site-verification" content='{{g.google_site_verification}}' />
+    {% endif %}  
+
     <link rel="apple-touch-icon" sizes="140x140" href="{{ url_for('static', filename='favicon.ico') }}">
     <link rel="shortcut icon" href="{{ url_for('static', filename='favicon.ico') }}">
 

cps/templates/readpdf.html

@@ -26,6 +26,9 @@ See https://github.com/adobe-type-tools/cmap-resources
     <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
     <meta name="google" content="notranslate">
     <meta http-equiv="X-UA-Compatible" content="IE=edge">
+    {% if g.google_site_verification|length > 0 %}
+      <meta name="google-site-verification" content='{{g.google_site_verification}}' />
+    {% endif %}      
     <title>{{_('PDF Reader')}} | {{title}}</title>
 
     <link rel="apple-touch-icon" sizes="140x140" href="{{ url_for('static', filename='favicon.ico') }}">

cps/templates/readtxt.html

@@ -7,6 +7,10 @@
         <meta name="description" content="">
         <meta name="viewport" content="width=device-width, user-scalable=no">
         <meta name="apple-mobile-web-app-capable" content="yes">
+        {% if g.google_site_verification|length > 0 %}
+          <meta name="google-site-verification" content='{{g.google_site_verification}}' />
+        {% endif %}  
+
         <link rel="apple-touch-icon" sizes="140x140" href="{{ url_for('static', filename='favicon.ico') }}">
         <link rel="shortcut icon" href="{{ url_for('static', filename='favicon.ico') }}">
 

cps/templates/shelfdown.html

@@ -6,6 +6,9 @@
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
     <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
     <meta name="apple-mobile-web-app-capable" content="yes">
+    {% if g.google_site_verification|length > 0 %}
+      <meta name="google-site-verification" content='{{g.google_site_verification}}' />
+    {% endif %}      
 
     <!-- Bootstrap -->
     <link rel="apple-touch-icon" sizes="140x140" href="{{ url_for('static', filename='favicon.ico') }}">