diff options
Diffstat (limited to 'src/main/resources/templates')
8 files changed, 131 insertions, 102 deletions
diff --git a/src/main/resources/templates/layouts/default.html b/src/main/resources/templates/layouts/default.html index 575e7707..5974e19b 100644 --- a/src/main/resources/templates/layouts/default.html +++ b/src/main/resources/templates/layouts/default.html @@ -1,49 +1,52 @@ <!DOCTYPE html> <html prefix="og: http://ogp.me/ns#"> + <head> - <meta charset="utf-8"/> - <meta http-equiv="X-UA-Compatible" content="IE=edge"/> + <meta charset="utf-8" /> + <meta http-equiv="X-UA-Compatible" content="IE=edge" /> <script type="text/javascript" src="{{ beans.webApp.scriptsUrl }}"></script> - <link rel="stylesheet" type="text/css" href="{{ beans.webApp.styleUrl }}"/> + <link rel="stylesheet" type="text/css" href="{{ beans.webApp.styleUrl }}" /> {% block headers %} {{ headers | default('') | raw }} {% endblock %} <title>{{ title | default('Juick') }}</title> <meta property="og:type" content="{{ ogtype | default('website') }}" /> <meta property="fb:app_id" content="130568668304" /> - <meta name="viewport" content="width=device-width,initial-scale=1"/> - <meta name="msapplication-config" content="//i.juick.com/browserconfig.xml"/> - <meta name="msapplication-TileColor" content="#ffffff"/> - <meta name="msapplication-TileImage" content="//i.juick.com/ms-icon-144x144.png"/> - <meta name="theme-color" content="#ffffff"/> + <meta name="viewport" content="width=device-width,initial-scale=1" /> + <meta name="msapplication-config" content="//i.juick.com/browserconfig.xml" /> + <meta name="msapplication-TileColor" content="#ffffff" /> + <meta name="msapplication-TileImage" content="//i.juick.com/ms-icon-144x144.png" /> + <meta name="theme-color" content="#ffffff" /> <meta name="apple-mobile-web-app-capable" content="yes" /> - <link rel="apple-touch-icon" sizes="57x57" href="//i.juick.com/apple-icon-57x57.png"/> - <link rel="apple-touch-icon" sizes="60x60" href="//i.juick.com/apple-icon-60x60.png"/> - <link rel="apple-touch-icon" sizes="72x72" href="//i.juick.com/apple-icon-72x72.png"/> - <link rel="apple-touch-icon" sizes="76x76" href="//i.juick.com/apple-icon-76x76.png"/> - <link rel="apple-touch-icon" sizes="114x114" href="//i.juick.com/apple-icon-114x114.png"/> - <link rel="apple-touch-icon" sizes="120x120" href="//i.juick.com/apple-icon-120x120.png"/> - <link rel="apple-touch-icon" sizes="144x144" href="//i.juick.com/apple-icon-144x144.png"/> - <link rel="apple-touch-icon" sizes="152x152" href="//i.juick.com/apple-icon-152x152.png"/> - <link rel="apple-touch-icon" sizes="180x180" href="//i.juick.com/apple-icon-180x180.png"/> - <link rel="icon" type="image/png" sizes="32x32" href="//i.juick.com/favicon-32x32.png"/> - <link rel="icon" type="image/png" sizes="96x96" href="//i.juick.com/favicon-96x96.png"/> - <link rel="icon" type="image/png" sizes="16x16" href="//i.juick.com/favicon-16x16.png"/> - <link rel="manifest" href="//i.juick.com/manifest.json"/> + <link rel="apple-touch-icon" sizes="57x57" href="//i.juick.com/apple-icon-57x57.png" /> + <link rel="apple-touch-icon" sizes="60x60" href="//i.juick.com/apple-icon-60x60.png" /> + <link rel="apple-touch-icon" sizes="72x72" href="//i.juick.com/apple-icon-72x72.png" /> + <link rel="apple-touch-icon" sizes="76x76" href="//i.juick.com/apple-icon-76x76.png" /> + <link rel="apple-touch-icon" sizes="114x114" href="//i.juick.com/apple-icon-114x114.png" /> + <link rel="apple-touch-icon" sizes="120x120" href="//i.juick.com/apple-icon-120x120.png" /> + <link rel="apple-touch-icon" sizes="144x144" href="//i.juick.com/apple-icon-144x144.png" /> + <link rel="apple-touch-icon" sizes="152x152" href="//i.juick.com/apple-icon-152x152.png" /> + <link rel="apple-touch-icon" sizes="180x180" href="//i.juick.com/apple-icon-180x180.png" /> + <link rel="icon" type="image/png" sizes="32x32" href="//i.juick.com/favicon-32x32.png" /> + <link rel="icon" type="image/png" sizes="96x96" href="//i.juick.com/favicon-96x96.png" /> + <link rel="icon" type="image/png" sizes="16x16" href="//i.juick.com/favicon-16x16.png" /> + <link rel="manifest" href="//i.juick.com/manifest.json" /> </head> -<body id="body" {% if visitor.uid > 0 %}data-hash="{{visitor.authHash}}"{% endif %}> -{% include "views/partial/navigation" %} -<div id="wrapper"> - <section id="content" - {% if msg | default('') is not empty %}data-mid="{{ msg.mid }}"{% endif %}> - {% block content %} - {% endblock %} - </section> - <aside id="column"> - {% block column %} - {% endblock %} - </aside> -</div> -{% include "views/partial/footer" %} + +<body id="body" {% if visitor.uid > 0 %}data-hash="{{visitor.authHash}}" {% endif %}> + <div id="app"> + {% include "views/partial/navigation" %} + <div id="wrapper"> + <section id="content" {% if msg | default('') is not empty %}data-mid="{{ msg.mid }}" {% endif %} class="content--top"> + {% block content %} + {% endblock %} + </section> + <aside id="column"> + {% block column %} + {% endblock %} + </aside> + </div> + </div> </body> + </html>
\ No newline at end of file diff --git a/src/main/resources/templates/views/help.html b/src/main/resources/templates/views/help.html index 3a022497..169ccb3f 100644 --- a/src/main/resources/templates/views/help.html +++ b/src/main/resources/templates/views/help.html @@ -6,5 +6,7 @@ {% endblock %} {% block "column" %} +<div class="toolbar"> {{ navigation | raw }} +</div> {% endblock %}
\ No newline at end of file diff --git a/src/main/resources/templates/views/partial/footer.html b/src/main/resources/templates/views/partial/footer.html index 785514bf..671b9b6a 100644 --- a/src/main/resources/templates/views/partial/footer.html +++ b/src/main/resources/templates/views/partial/footer.html @@ -1,16 +1,16 @@ <div id="footer"> - <div id="footer-right"> · - <a href="/help/contacts" rel="nofollow">{{ i18n("messages","link.contacts") }}</a> · - <a href="/help/tos" rel="nofollow">{{ i18n("messages","link.tos") }}</a> - </div> + <div id="footer-left">juick.com © 2008-2020 + {% if links | default ('') is not empty %} + <br/>{{ i18n("messages","label.sponsors") }}: {{ links | raw }} + {% endif %} + </div> <div id="footer-social"> <a href="https://twitter.com/Juick" rel="nofollow"><i data-icon="ei-sc-twitter" data-size="m"></i></a> <a href="https://vk.com/juick" rel="nofollow"><i data-icon="ei-sc-vk" data-size="m"></i></a> <a href="https://www.facebook.com/JuickCom" rel="nofollow"><i data-icon="ei-sc-facebook" data-size="m"></i></a> </div> - <div id="footer-left">juick.com © 2008-2020 - {% if links | default ('') is not empty %} - <br/>{{ i18n("messages","label.sponsors") }}: {{ links | raw }} - {% endif %} + <div id="footer-right"> · + <a href="/help/contacts" rel="nofollow">{{ i18n("messages","link.contacts") }}</a> · + <a href="/help/tos" rel="nofollow">{{ i18n("messages","link.tos") }}</a> </div> </div> diff --git a/src/main/resources/templates/views/partial/homecolumn.html b/src/main/resources/templates/views/partial/homecolumn.html index 5b13dd66..6f92f8ba 100644 --- a/src/main/resources/templates/views/partial/homecolumn.html +++ b/src/main/resources/templates/views/partial/homecolumn.html @@ -1,15 +1,18 @@ <div class="toolbar"> <a href="/?show=top" title="Top"> - <i data-icon="ei-heart" data-size="s"></i>Top + <i data-icon="ei-heart" data-size="s"></i> + <span class="desktop">Top</span> </a> <a href="/?show=all" title="{{ i18n("messages", "link.allMessages") }}"> - <i data-icon="ei-search" data-size="s"></i>{{ i18n("messages","link.allMessages") }} + <i data-icon="ei-search" data-size="s"></i> + <span class="desktop">{{ i18n("messages","link.allMessages") }}</span> </a> <a href="/?show=photos" title="{{ i18n("messages", "link.withPhotos") }}"> - <i data-icon="ei-camera" data-size="s"></i>{{ i18n("messages", "link.withPhotos") }} + <i data-icon="ei-camera" data-size="s"></i> + <span class="desktop">{{ i18n("messages", "link.withPhotos") }}</span> </a> </div> -<div class="tags"> +<div class="tags desktop"> <h4>{{ i18n("messages","link.trends") }}</h4> {% include "views/partial/tags" %} {% if showAdv | default(false) %} @@ -18,4 +21,7 @@ <img src="https://ru.jooble.org/css/images/logos/jooble_80x30.png" alt="Работа в России"/> </a> {% endif %} -</div>
\ No newline at end of file +</div> +<span class="desktop"> + {% include "views/partial/footer" %} +</span>
\ No newline at end of file diff --git a/src/main/resources/templates/views/partial/navigation.html b/src/main/resources/templates/views/partial/navigation.html index a3621bef..f3d43641 100644 --- a/src/main/resources/templates/views/partial/navigation.html +++ b/src/main/resources/templates/views/partial/navigation.html @@ -1,4 +1,4 @@ -<header> +<div id="header"> <div id="header_wrapper"> {% if visitor.uid > 0 %} <div id="ctitle"> @@ -12,7 +12,7 @@ {% else %} <div id="logo"><a href="/{% if visitor.uid > 0 %}?show=my{% endif %}">Juick</a></div> {% endif %} - <div id="search"> + <div id="search" class="desktop"> <form action="/"> <input name="search" class="text" placeholder="{{ i18n('messages','label.search') }}" value="{{ search | default('') }}"/> @@ -21,23 +21,23 @@ <nav id="global"> <a href="/"> <i data-icon="ei-bell" data-size="s"></i> - <span class="icon-title">{{ i18n("messages","link.discuss") }}</span>{% if visitor.unreadCount > 0 %}<span class="badge">{{ visitor.unreadCount }}</span>{% endif %} + <span class="icon-title desktop">{{ i18n("messages","link.discuss") }}</span>{% if visitor.unreadCount > 0 %}<span class="badge">{{ visitor.unreadCount }}</span>{% endif %} </a> <a href="/?show=all" rel="nofollow"> <i data-icon="ei-search" data-size="s"></i> - <span class="icon-title">{{ i18n("messages","link.allMessages") }}</span> + <span class="icon-title desktop">{{ i18n("messages","link.allMessages") }}</span> </a> {% if visitor.uid > 0 %} <a id="post" href="/post"> <i data-icon="ei-pencil" data-size="s"></i> - <span class="icon-title">{{ i18n("messages","link.postMessage") }}</span> + <span class="icon-title desktop">{{ i18n("messages","link.postMessage") }}</span> </a> {% else %} <a class="a-login" href="/login" rel="nofollow"> <i data-icon="ei-user" data-size="s"></i> - <span class="icon-title">{{ i18n("messages", "link.Login") }}</span> + <span class="icon-title desktop">{{ i18n("messages", "link.Login") }}</span> </a> {% endif %} </nav> </div> -</header> +</div> diff --git a/src/main/resources/templates/views/partial/settings_tabs.html b/src/main/resources/templates/views/partial/settings_tabs.html index 60337d92..00f7068a 100644 --- a/src/main/resources/templates/views/partial/settings_tabs.html +++ b/src/main/resources/templates/views/partial/settings_tabs.html @@ -5,4 +5,7 @@ <a href="/settings?page=about">{{ i18n("messages","link.settings.about") }}</a> <a href="/logout"><i data-icon="ei-user" data-size="s"></i>{{ i18n("messages","link.logout") }}</a> </div> -</div>
\ No newline at end of file +</div> +<span class="desktop"> + {% include "views/partial/footer" %} +</span>
\ No newline at end of file diff --git a/src/main/resources/templates/views/partial/tagcolumn.html b/src/main/resources/templates/views/partial/tagcolumn.html index c411c3c4..4d8ad160 100644 --- a/src/main/resources/templates/views/partial/tagcolumn.html +++ b/src/main/resources/templates/views/partial/tagcolumn.html @@ -23,3 +23,6 @@ {% endif %} </div> {% endif %} +<span class="desktop"> + {% include "views/partial/footer" %} +</span>
\ No newline at end of file diff --git a/src/main/resources/templates/views/partial/usercolumn.html b/src/main/resources/templates/views/partial/usercolumn.html index 5d1aaff6..4beefd8a 100644 --- a/src/main/resources/templates/views/partial/usercolumn.html +++ b/src/main/resources/templates/views/partial/usercolumn.html @@ -1,60 +1,69 @@ -{% if visitor is not empty and visitor.uid > 0 and visitor.uid != user.uid %} -<div id="ctitle"> - <a href="/{{ user.name }}"> - <img src="{{ user.avatar }}" alt=""/>{{ user.name }} - </a> -</div> <div class="toolbar"> - {% if isSubscribed %} - <a href="/post?body=U+%40{{ user.name }}" title="Подписан"> - <i data-icon="ei-check" data-size="s"></i>Subscribed - </a> - {% else %} - <a href="/post?body=S+%40{{ user.name }}" title="Подписаться"> - <i data-icon="ei-plus" data-size="s"></i>Subscribe - </a> + {% if visitor is not empty and visitor.uid > 0 and visitor.uid != user.uid %} + <div id="ctitle"> + <a href="/{{ user.name }}"> + <img src="{{ user.avatar }}" alt="" />{{ user.name }} + </a> + </div> + <div class="toolbar"> + {% if isSubscribed %} + <a href="/post?body=U+%40{{ user.name }}" title="Подписан"> + <i data-icon="ei-check" data-size="s"></i>Subscribed + </a> + {% else %} + <a href="/post?body=S+%40{{ user.name }}" title="Подписаться"> + <i data-icon="ei-plus" data-size="s"></i>Subscribe + </a> + {% endif %} + {% if isInBL %} + <a href="/post?body=BL+%40{{ user.name }}" title="Разблокировать"> + <i data-icon="ei-close-o" data-size="s"></i>Unblock + </a> + {% else %} + <a href="/post?body=BL+%40{{ user.name }}" title="Заблокировать"> + <i data-icon="ei-close" data-size="s"></i>Block + </a> + {% endif %} + {% if not isInBLAny %} + <a href="/pm/sent?uname={{ user.name }}" title="Написать приватное сообщение"> + <i data-icon="ei-envelope" data-size="s"></i>PM + </a> + {% endif %} + </div> {% endif %} - {% if isInBL %} - <a href="/post?body=BL+%40{{ user.name }}" title="Разблокировать"> - <i data-icon="ei-close-o" data-size="s"></i>Unblock + {% if visitor is not empty and visitor.uid == user.uid %} + <a href="/?show=my"><i data-icon="ei-clock" data-size="s"></i> + <span class="desktop">{{ i18n("messages","link.my") }}</span> </a> - {% else %} - <a href="/post?body=BL+%40{{ user.name }}" title="Заблокировать"> - <i data-icon="ei-close" data-size="s"></i>Block + <a href="/pm/inbox"><i data-icon="ei-envelope" data-size="s"></i> + <span class="desktop">{{ i18n("messages","link.privateMessages") }}</span> </a> - {% endif %} - {% if not isInBLAny %} - <a href="/pm/sent?uname={{ user.name }}" title="Написать приватное сообщение"> - <i data-icon="ei-envelope" data-size="s"></i>PM + <a href="/?show=discuss"><i data-icon="ei-bell" data-size="s"></i> + <span class="desktop">{{ i18n("messages","link.discuss") }}</span> </a> {% endif %} -</div> -{% endif %} -<div class="toolbar"> - {% if visitor is not empty and visitor.uid == user.uid %} - <a href="/?show=my"><i data-icon="ei-clock" data-size="s"></i>{{ i18n("messages","link.my") }}</a> - <a href="/pm/inbox"><i data-icon="ei-envelope" data-size="s"></i>{{ i18n("messages","link.privateMessages") }}</a> - <a href="/?show=discuss"><i data-icon="ei-bell" data-size="s"></i>{{ i18n("messages","link.discuss") }}</a> - {% endif %} {% if visitor is not empty and visitor.uid == user.uid and false %} <a href="/?show=mycomments" rel="nofollow">{{ i18n("messages","blog.comments") }}</a> <a href="/?show=unanswered" rel="nofollow">Неотвеченные</a> {% endif %} {% if visitor is not empty and visitor.uid == user.uid %} - <a href="/settings" rel="nofollow"> - <i data-icon="ei-gear" data-size="s"></i>{{ i18n("messages","link.settings") }} - {% if not visitor.verified %} - <span style="color:red;"><i data-icon="ei-exclamation" data-size="s"></i></span> - {% endif %} - </a> + <a href="/settings" rel="nofollow"> + <i data-icon="ei-gear" data-size="s"></i> + <span class="desktop">{{ i18n("messages","link.settings") }}</span> + {% if not visitor.verified %} + <span style="color:red;"><i data-icon="ei-exclamation" data-size="s"></i></span> + {% endif %} + </a> {% endif %} </div> -<form action="/{{ user.name }}/"> - <p><input type="text" name="search" class="inp" placeholder="{{ i18n('messages','label.search') }}"/></p> +<form action="/{{ user.name }}/" class="desktop" style="padding: 6px;"> + <p><input type="text" name="search" class="inp" placeholder="{{ i18n('messages','label.search') }}" /></p> </form> -{% include "views/partial/usertags" %} -<div id="ustats"> +<span class="desktop" style="padding: 6px;"> + {% include "views/partial/usertags" %} +</span> +<div id="ustats" class="desktop" style="padding: 6px;"> <ul> <li><a href="/{{ user.name }}/friends">{{ i18n("messages","blog.iread") }}: {{ statsIRead }}</a></li> <li><a href="/{{ user.name }}/readers">{{ i18n("messages","blog.readers") }}: {{ statsMyReaders }}</a></li> @@ -68,12 +77,15 @@ <div class="iread"> {% for u in iread %} <span> - <a href="/{{ u.name }}/"> - <img src="//i.juick.com/as/{{ u.uid }}.png" alt="{{ u.name }}"/> - </a> - </span> + <a href="/{{ u.name }}/"> + <img src="//i.juick.com/as/{{ u.uid }}.png" alt="{{ u.name }}" /> + </a> + </span> {% endfor %} </div> {% endif %} </div> +<span class="desktop"> + {% include "views/partial/footer" %} +</span>
\ No newline at end of file |