Commit 7eac830314ed8b2cb9d920799e4f2cd234f3387c

Authored by Administrator
1 parent b540cc41

01.06.16

Showing 2 changed files with 97 additions and 97 deletions   Show diff stats
.htaccess
... ... @@ -118,24 +118,24 @@ AddDefaultCharset utf-8
118 118 #RewriteRule ^(.*)$ $1.gz [QSA,L]
119 119 #</IfModule>
120 120 # Cache-Control
121   -<ifModule mod_headers.c>
122   -# 30 дней
123   -<filesMatch "\.(ico|pdf|flv|jpg|jpeg|png|gif|swf)$">
124   -Header set Cache-Control "max-age=2592000, public"
125   -</filesMatch>
126   -# 30 дней
127   -<filesMatch "\.(css|js)$">
128   -Header set Cache-Control "max-age=2592000, public"
129   -</filesMatch>
130   -# 2 дня
131   -<filesMatch "\.(xml|txt)$">
132   -Header set Cache-Control "max-age=172800, public, must-revalidate"
133   -</filesMatch>
134   -# 1 день
135   -<filesMatch "\.(html|htm|php)$">
136   -Header set Cache-Control "max-age=172800, private, must-revalidate"
137   -</filesMatch>
138   -</ifModule>
  121 +#<ifModule mod_headers.c>
  122 +## 30 дней
  123 +#<filesMatch "\.(ico|pdf|flv|jpg|jpeg|png|gif|swf)$">
  124 +#Header set Cache-Control "max-age=2592000, public"
  125 +#</filesMatch>
  126 +## 30 дней
  127 +#<filesMatch "\.(css|js)$">
  128 +#Header set Cache-Control "max-age=2592000, public"
  129 +#</filesMatch>
  130 +## 2 дня
  131 +#<filesMatch "\.(xml|txt)$">
  132 +#Header set Cache-Control "max-age=172800, public, must-revalidate"
  133 +#</filesMatch>
  134 +## 1 день
  135 +#<filesMatch "\.(html|htm|php)$">
  136 +#Header set Cache-Control "max-age=172800, private, must-revalidate"
  137 +#</filesMatch>
  138 +#</ifModule>
139 139  
140 140 #Запрет отдачи HTTP-заголовков Vary браузерам семейства MSIE
141 141 <IfModule mod_setenvif.c>
... ...
frontend/views/layouts/main.php
... ... @@ -183,78 +183,78 @@ ga(&#39;send&#39;, &#39;pageview&#39;);
183 183 <div class="rightbar2">
184 184  
185 185 <div class="socialbox">
186   -<!-- <div class="vk_box hide">-->
187   -<!-- <script type="text/javascript" src="//vk.com/js/api/openapi.js?116"></script>-->
188   -<!---->
189   -<!-- <!-- VK Widget -->-->
190   -<!-- <div id="vk_groups"></div>-->
191   -<!-- <script type="text/javascript">-->
192   -<!-- VK.Widgets.Group("vk_groups", {-->
193   -<!-- mode: 0,-->
194   -<!-- width: "320",-->
195   -<!-- height: "213",-->
196   -<!-- color1: 'FFFFFF',-->
197   -<!-- color2: '2B587A',-->
198   -<!-- color3: '5B7FA6'-->
199   -<!-- }, 99037905);-->
200   -<!-- </script>-->
201   -<!-- </div>-->
202   -<!-- <div class="fb_box hide">-->
203   -<!-- <div id="fb-root"></div>-->
204   -<!-- <script>(function (d, s, id) {-->
205   -<!-- var js, fjs = d.getElementsByTagName(s)[0];-->
206   -<!-- if (d.getElementById(id)) return;-->
207   -<!-- js = d.createElement(s);-->
208   -<!-- js.id = id;-->
209   -<!-- js.src = "//connect.facebook.net/ru_RU/sdk.js#xfbml=1&version=v2.4";-->
210   -<!-- fjs.parentNode.insertBefore(js, fjs);-->
211   -<!-- }(document, 'script', 'facebook-jssdk'));</script>-->
212   -<!-- <div class="fb-page" data-href="https://www.facebook.com/pages/Rukzachokcomua/1031766016856430"-->
213   -<!-- data-width="320" data-height="213" data-small-header="false"-->
214   -<!-- data-adapt-container-width="true" data-hide-cover="false" data-show-facepile="true"-->
215   -<!-- data-show-posts="true">-->
216   -<!-- <div class="fb-xfbml-parse-ignore">-->
217   -<!-- <blockquote cite="https://www.facebook.com/pages/Rukzachokcomua/1031766016856430"><a-->
218   -<!-- href="https://www.facebook.com/pages/Rukzachokcomua/1031766016856430">Rukzachok.com.ua</a>-->
219   -<!-- </blockquote>-->
220   -<!-- </div>-->
221   -<!-- </div>-->
222   -<!-- </div>-->
223   -<!---->
224   -<!-- <div class="gp_box hide">-->
225   -<!---->
226   -<!-- <script src="https://apis.google.com/js/platform.js" async defer>-->
227   -<!-- {-->
228   -<!-- lang: 'ru'-->
229   -<!-- }-->
230   -<!-- </script>-->
231   -<!---->
232   -<!-- <div class="g-page" data-href="https://plus.google.com/106638911242676218673"-->
233   -<!-- data-rel="publisher"></div>-->
234   -<!-- </div>-->
235   -
236   -<!-- <div class="ok_box hide">-->
237   -<!-- <div id="ok_group_widget"></div>-->
238   -<!-- <script>-->
239   -<!-- !function (d, id, did, st) {-->
240   -<!-- var js = d.createElement("script");-->
241   -<!-- js.src = "http://connect.ok.ru/connect.js";-->
242   -<!-- js.onload = js.onreadystatechange = function () {-->
243   -<!-- if (!this.readyState || this.readyState == "loaded" || this.readyState == "complete") {-->
244   -<!-- if (!this.executed) {-->
245   -<!-- this.executed = true;-->
246   -<!-- setTimeout(function () {-->
247   -<!-- OK.CONNECT.insertGroupWidget(id, did, st);-->
248   -<!-- }, 0);-->
249   -<!-- }-->
250   -<!-- }-->
251   -<!-- }-->
252   -<!-- d.documentElement.appendChild(js);-->
253   -<!-- }(document, "ok_group_widget", "52719911305396", "{width:320,height:213}");-->
254   -<!-- </script>-->
255   -<!---->
256   -<!---->
257   -<!-- </div>-->
  186 + <div class="vk_box hide">
  187 + <script type="text/javascript" src="//vk.com/js/api/openapi.js?116"></script>
  188 +
  189 + <!-- VK Widget -->
  190 + <div id="vk_groups"></div>
  191 + <script type="text/javascript">
  192 + VK.Widgets.Group("vk_groups", {
  193 + mode: 0,
  194 + width: "320",
  195 + height: "213",
  196 + color1: 'FFFFFF',
  197 + color2: '2B587A',
  198 + color3: '5B7FA6'
  199 + }, 99037905);
  200 + </script>
  201 + </div>
  202 + <div class="fb_box hide">
  203 + <div id="fb-root"></div>
  204 + <script>(function (d, s, id) {
  205 + var js, fjs = d.getElementsByTagName(s)[0];
  206 + if (d.getElementById(id)) return;
  207 + js = d.createElement(s);
  208 + js.id = id;
  209 + js.src = "//connect.facebook.net/ru_RU/sdk.js#xfbml=1&version=v2.4";
  210 + fjs.parentNode.insertBefore(js, fjs);
  211 + }(document, 'script', 'facebook-jssdk'));</script>
  212 + <div class="fb-page" data-href="https://www.facebook.com/pages/Rukzachokcomua/1031766016856430"
  213 + data-width="320" data-height="213" data-small-header="false"
  214 + data-adapt-container-width="true" data-hide-cover="false" data-show-facepile="true"
  215 + data-show-posts="true">
  216 + <div class="fb-xfbml-parse-ignore">
  217 + <blockquote cite="https://www.facebook.com/pages/Rukzachokcomua/1031766016856430"><a
  218 + href="https://www.facebook.com/pages/Rukzachokcomua/1031766016856430">Rukzachok.com.ua</a>
  219 + </blockquote>
  220 + </div>
  221 + </div>
  222 + </div>
  223 +
  224 + <div class="gp_box hide">
  225 +
  226 + <script src="https://apis.google.com/js/platform.js" async defer>
  227 + {
  228 + lang: 'ru'
  229 + }
  230 + </script>
  231 +
  232 + <div class="g-page" data-href="https://plus.google.com/106638911242676218673"
  233 + data-rel="publisher"></div>
  234 + </div>
  235 +
  236 + <div class="ok_box hide">
  237 + <div id="ok_group_widget"></div>
  238 + <script>
  239 + !function (d, id, did, st) {
  240 + var js = d.createElement("script");
  241 + js.src = "http://connect.ok.ru/connect.js";
  242 + js.onload = js.onreadystatechange = function () {
  243 + if (!this.readyState || this.readyState == "loaded" || this.readyState == "complete") {
  244 + if (!this.executed) {
  245 + this.executed = true;
  246 + setTimeout(function () {
  247 + OK.CONNECT.insertGroupWidget(id, did, st);
  248 + }, 0);
  249 + }
  250 + }
  251 + }
  252 + d.documentElement.appendChild(js);
  253 + }(document, "ok_group_widget", "52719911305396", "{width:320,height:213}");
  254 + </script>
  255 +
  256 +
  257 + </div>
258 258 <div class="tw_box hide">Пока нет!</div>
259 259  
260 260 </div>
... ... @@ -335,13 +335,13 @@ ga(&#39;send&#39;, &#39;pageview&#39;);
335 335 <div class="both"></div>
336 336 <br><br><br>
337 337  
338   -<!-- <ul class="social">-->
339   -<!-- <li><a class="vk" id="vk" target="_blank">vk.com</a></li>-->
340   -<!-- <li><a class="fb" id="fb">facebook.com</a></li>-->
341   -<!-- <li><a class="ok" id="ok" target="_blank">odnoklassniki.ru</a></li>-->
342   -<!-- <li><a class="gp" id="gp" href="https://plus.google.com/+ArtwebUaAgency" target="_blank">plus.google.com</a>-->
343   -<!-- </li>-->
344   -<!-- </ul>-->
  338 + <ul class="social">
  339 + <li><a class="vk" id="vk" target="_blank">vk.com</a></li>
  340 + <li><a class="fb" id="fb">facebook.com</a></li>
  341 + <li><a class="ok" id="ok" target="_blank">odnoklassniki.ru</a></li>
  342 + <li><a class="gp" id="gp" href="https://plus.google.com/+ArtwebUaAgency" target="_blank">plus.google.com</a>
  343 + </li>
  344 + </ul>
345 345 <div class="both"></div>
346 346  
347 347 </div>
... ...