From: Roman Bazalevsky <rvb@rvb.name>
Date: Fri, 20 May 2016 11:32:41 +0000 (+0300)
Subject: Различные способы отображения обложки для случаев с включенными и выключенными fancyapps
X-Git-Url: https://git.rvb.name/openlib.git/commitdiff_plain/de4a5d3664fd9de7c8fd560745668c320c018b45?ds=inline

Различные способы отображения обложки для случаев с включенными и выключенными fancyapps
---

diff --git a/www/lang/Localization_ru.json b/www/lang/Localization_ru.json
index d7cdb38..0b82275 100644
--- a/www/lang/Localization_ru.json
+++ b/www/lang/Localization_ru.json
@@ -143,6 +143,7 @@
 "languages.tg":"Таджикский",
 "languages.tr":"Турецкий",
 "languages.ga":"Гэльский",
+"languages.ka":"Грузинский",
 "tags.sf_history":"Альтернативная история",
 "tags.sf_action":"Боевая Фантастика",
 "tags.sf_epic":"Эпическая Фантастика",
diff --git a/www/styles/style-default.css b/www/styles/style-default.css
index b8166b8..7529081 100644
--- a/www/styles/style-default.css
+++ b/www/styles/style-default.css
@@ -394,8 +394,6 @@ body {  margin: 5px;
     }
 }
 
-
-
 .modalDialog {
 	position: fixed;
 	font-family: Arial, Helvetica, sans-serif;
@@ -451,4 +449,3 @@ body {  margin: 5px;
 }
 
 .close:hover { background: #00d9ff; }
-
diff --git a/www/styles/style-eink.css b/www/styles/style-eink.css
index d35b344..13327fe 100644
--- a/www/styles/style-eink.css
+++ b/www/styles/style-eink.css
@@ -401,36 +401,36 @@ body {  margin: 5px;
 }
 
 .modalDialog {
-        position: fixed;
-        font-family: Arial, Helvetica, sans-serif;
-        top: 0;
-        right: 0;
-        bottom: 0;
-        left: 0;
-        background: rgba(0,0,0,0.8);
-        z-index: 99999;
-        opacity:0;
-        -webkit-transition: opacity 400ms ease-in;
-        -moz-transition: opacity 400ms ease-in;
-        transition: opacity 400ms ease-in;
-        pointer-events: none;
+	position: fixed;
+	font-family: Arial, Helvetica, sans-serif;
+	top: 0;
+	right: 0;
+	bottom: 0;
+	left: 0;
+	background: rgba(0,0,0,0.8);
+	z-index: 99999;
+	opacity:0;
+	-webkit-transition: opacity 400ms ease-in;
+	-moz-transition: opacity 400ms ease-in;
+	transition: opacity 400ms ease-in;
+	pointer-events: none;
 }
 
 .modalDialog:target {
-        opacity:1;
-        pointer-events: auto;
+	opacity:1;
+	pointer-events: auto;
 }
 
 .modalDialog > div {
-        width: 400px;
-        position: relative;
-        margin: 10% auto;
-        padding: 5px 20px 13px 20px;
-        border-radius: 10px;
-        background: #fff;
-        background: -moz-linear-gradient(#fff, #999);
-        background: -webkit-linear-gradient(#fff, #999);
-        background: -o-linear-gradient(#fff, #999);
+	width: 400px;
+	position: relative;
+	margin: 10% auto;
+	padding: 5px 20px 13px 20px;
+	border-radius: 10px;
+	background: #fff;
+	background: -moz-linear-gradient(#fff, #999);
+	background: -webkit-linear-gradient(#fff, #999);
+	background: -o-linear-gradient(#fff, #999);
 }
 
 
diff --git a/www/templates/default/bookdetail.html b/www/templates/default/bookdetail.html
index be7e54a..e30f03c 100644
--- a/www/templates/default/bookdetail.html
+++ b/www/templates/default/bookdetail.html
@@ -1,20 +1,27 @@
 <article class="bookpopup">
-    {{? it.book.hasCover == 1}}
+    {{? $.cookie("use_fancyapps") == 1}}
     <div id="openModal" class="modalDialog">
-        <div>
-            <a href="#close" title="Close" class="close">X</a>
-            {{~it.book.authors:author:j}}
+      <div>
+        <a href="#close" title="Close" class="close">X</a>
+          {{~it.book.authors:author:j}}
             {{? j > 0}}, {{?}}<h3>{{=htmlEscape (author.name)}}</h3>
-            {{~}}
-            <h2>{{=htmlEscape (it.title)}}</h2>
-            <img src="{{=it.book.coverurl}}" alt="{{=it.const.i18n.coverAlt}}" />
-	</div>
+          {{~}}
+        <h2>{{=htmlEscape (it.title)}}</h2>
+        <img src="{{=it.book.coverurl}}" alt="{{=it.const.i18n.coverAlt}}" />
+      </div>
     </div>
     {{?}}
     <span class="cover">
         {{? it.book.hasCover == 1}}
+        {{? $.cookie("use_fancyapps") == 1}}
         <a href="#openModal">
-          <img src="{{=it.book.thumbnailurl}}" alt="{{=it.const.i18n.coverAlt}}" />
+        {{?}}
+        {{? $.cookie("use_fancyapps") == 0}}
+        <a href="{{=it.book.coverurl}}">
+        {{?}}
+          <div class="fullclickpopup">
+          <img src="{{=it.book.thumbnailurl}}" alt="{{=it.const.i18n.coverAlt}}">
+          </div>
         </a>
         {{?}}
     </span>