Clean up actionbar
This commit is contained in:
parent
ec893149d1
commit
5f12afdda9
12 changed files with 201 additions and 209 deletions
|
@ -259,6 +259,10 @@
|
||||||
|
|
||||||
|
|
||||||
@media (max-width: 799px) {
|
@media (max-width: 799px) {
|
||||||
|
.actionbar-box {
|
||||||
|
margin: 8px 0;
|
||||||
|
}
|
||||||
|
|
||||||
.left-sidebar-header {
|
.left-sidebar-header {
|
||||||
display: none;
|
display: none;
|
||||||
}
|
}
|
||||||
|
@ -284,6 +288,7 @@
|
||||||
.blog-box {
|
.blog-box {
|
||||||
padding-left: 5%;
|
padding-left: 5%;
|
||||||
padding-right: 5%;
|
padding-right: 5%;
|
||||||
|
margin-bottom: 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
.post-title {
|
.post-title {
|
||||||
|
|
|
@ -7,14 +7,14 @@
|
||||||
<span class="actionbar-block" style="justify-content: flex-start;">
|
<span class="actionbar-block" style="justify-content: flex-start;">
|
||||||
<span id="like-button-{{pagevote.id}}"
|
<span id="like-button-{{pagevote.id}}"
|
||||||
class="like-button actionbar-button {% if pagevote.vote_score(request.profile) == 1 %}voted{% endif %}"
|
class="like-button actionbar-button {% if pagevote.vote_score(request.profile) == 1 %}voted{% endif %}"
|
||||||
onclick="javascript:pagevote_upvote({{ pagevote.id }})">
|
onclick="javascript:pagevote_upvote({{ pagevote.id }}, event)">
|
||||||
<span class="pagevote-score" id="pagevote-score-{{pagevote.id}}">{{ pagevote.score }}</span>
|
<span class="pagevote-score" id="pagevote-score-{{pagevote.id}}">{{ pagevote.score }}</span>
|
||||||
<i class="fa fa-thumbs-o-up" style="font-size: large;"></i>
|
<i class="fa fa-thumbs-o-up" style="font-size: large;"></i>
|
||||||
<span class="actionbar-text">{{_("Like")}}</span>
|
<span class="actionbar-text">{{_("Like")}}</span>
|
||||||
</span>
|
</span>
|
||||||
<span id="dislike-button-{{pagevote.id}}"
|
<span id="dislike-button-{{pagevote.id}}"
|
||||||
class="dislike-button actionbar-button {% if pagevote.vote_score(request.profile) == -1 %}voted{% endif %}"
|
class="dislike-button actionbar-button {% if pagevote.vote_score(request.profile) == -1 %}voted{% endif %}"
|
||||||
onclick="javascript:pagevote_downvote({{ pagevote.id }})">
|
onclick="javascript:pagevote_downvote({{ pagevote.id }}, event)">
|
||||||
<i class="fa fa-thumbs-o-down" style="font-size: large;"></i>
|
<i class="fa fa-thumbs-o-down" style="font-size: large;"></i>
|
||||||
</span>
|
</span>
|
||||||
</span>
|
</span>
|
||||||
|
@ -30,7 +30,7 @@
|
||||||
<span class="actionbar-block">
|
<span class="actionbar-block">
|
||||||
<span id="bookmark-button-{{bookmark.id}}"
|
<span id="bookmark-button-{{bookmark.id}}"
|
||||||
class="bookmark-button actionbar-button {% if bookmark.get_bookmark(request.profile) == True %} bookmarked {% endif %}"
|
class="bookmark-button actionbar-button {% if bookmark.get_bookmark(request.profile) == True %} bookmarked {% endif %}"
|
||||||
onclick="javascript:bookmark({{ bookmark.id }})">
|
onclick="javascript:bookmark({{ bookmark.id }}, event)">
|
||||||
<i class="fa fa-bookmark-o" style="font-size: large;"></i>
|
<i class="fa fa-bookmark-o" style="font-size: large;"></i>
|
||||||
<span class="actionbar-text">{{_("Bookmark")}}</span>
|
<span class="actionbar-text">{{_("Bookmark")}}</span>
|
||||||
</span>
|
</span>
|
||||||
|
|
|
@ -1,7 +0,0 @@
|
||||||
<style>
|
|
||||||
@media (max-width: 799px) {
|
|
||||||
.actionbar-text {
|
|
||||||
display: none;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
</style>
|
|
|
@ -37,7 +37,8 @@
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
window.bookmark = function(id) {
|
window.bookmark = function(id, e) {
|
||||||
|
e.stopPropagation();
|
||||||
var $bookmark = $('#bookmark-button-' + id);
|
var $bookmark = $('#bookmark-button-' + id);
|
||||||
if ($bookmark.hasClass('bookmarked')) {
|
if ($bookmark.hasClass('bookmarked')) {
|
||||||
ajax_bookmark('{{ url('undobookmark') }}', id, function () {
|
ajax_bookmark('{{ url('undobookmark') }}', id, function () {
|
||||||
|
@ -61,7 +62,8 @@
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
window.pagevote_upvote = function (id) {
|
window.pagevote_upvote = function (id, e) {
|
||||||
|
e.stopPropagation();
|
||||||
var $votes = get_$votes(id);
|
var $votes = get_$votes(id);
|
||||||
if ($votes.upvote.hasClass('voted')) {
|
if ($votes.upvote.hasClass('voted')) {
|
||||||
ajax_vote('{{ url('pagevote_downvote') }}', id, -1, function () {
|
ajax_vote('{{ url('pagevote_downvote') }}', id, -1, function () {
|
||||||
|
@ -83,7 +85,8 @@
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
window.pagevote_downvote = function (id) {
|
window.pagevote_downvote = function (id, e) {
|
||||||
|
e.stopPropagation();
|
||||||
var $votes = get_$votes(id);
|
var $votes = get_$votes(id);
|
||||||
if ($votes.downvote.hasClass('voted')) {
|
if ($votes.downvote.hasClass('voted')) {
|
||||||
ajax_vote('{{ url('pagevote_upvote') }}', id, 1, function () {
|
ajax_vote('{{ url('pagevote_upvote') }}', id, 1, function () {
|
||||||
|
@ -104,7 +107,8 @@
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
$(".actionbar-share").click( function() {
|
$(".actionbar-share").click(function(e) {
|
||||||
|
e.stopPropagation();
|
||||||
link = $(this).attr("share-url") || window.location.href;
|
link = $(this).attr("share-url") || window.location.href;
|
||||||
navigator.clipboard
|
navigator.clipboard
|
||||||
.writeText(link)
|
.writeText(link)
|
||||||
|
|
|
@ -7,7 +7,6 @@
|
||||||
|
|
||||||
{% block media %}
|
{% block media %}
|
||||||
{% include "comments/media-css.html" %}
|
{% include "comments/media-css.html" %}
|
||||||
{% include "actionbar/media-css.html" %}
|
|
||||||
{% endblock %}
|
{% endblock %}
|
||||||
|
|
||||||
{% block title_row %}
|
{% block title_row %}
|
||||||
|
|
|
@ -1,7 +1,6 @@
|
||||||
{% extends "three-column-content.html" %}
|
{% extends "three-column-content.html" %}
|
||||||
{% block three_col_media %}
|
{% block three_col_media %}
|
||||||
{% include "blog/media-css.html" %}
|
{% include "blog/media-css.html" %}
|
||||||
{% include "actionbar/media-css.html" %}
|
|
||||||
<style>
|
<style>
|
||||||
@media (max-width: 799px) {
|
@media (max-width: 799px) {
|
||||||
.title {
|
.title {
|
||||||
|
|
|
@ -18,7 +18,6 @@
|
||||||
|
|
||||||
{% block two_col_media %}
|
{% block two_col_media %}
|
||||||
{% include "comments/media-css.html" %}
|
{% include "comments/media-css.html" %}
|
||||||
{% include "actionbar/media-css.html" %}
|
|
||||||
{% endblock %}
|
{% endblock %}
|
||||||
|
|
||||||
{% block middle_content %}
|
{% block middle_content %}
|
||||||
|
|
|
@ -6,10 +6,6 @@
|
||||||
{% include "actionbar/media-js.html" %}
|
{% include "actionbar/media-js.html" %}
|
||||||
{% endblock %}
|
{% endblock %}
|
||||||
|
|
||||||
{% block three_col_media %}
|
|
||||||
{% include "actionbar/media-css.html" %}
|
|
||||||
{% endblock %}
|
|
||||||
|
|
||||||
{% block middle_title %}
|
{% block middle_title %}
|
||||||
<div class="page-title">
|
<div class="page-title">
|
||||||
<div class="tabs" style="border: none;">
|
<div class="tabs" style="border: none;">
|
||||||
|
|
|
@ -7,7 +7,6 @@
|
||||||
|
|
||||||
{% block content_media %}
|
{% block content_media %}
|
||||||
{% include "comments/media-css.html" %}
|
{% include "comments/media-css.html" %}
|
||||||
{% include "actionbar/media-css.html" %}
|
|
||||||
{% endblock %}
|
{% endblock %}
|
||||||
|
|
||||||
{% block header %}
|
{% block header %}
|
||||||
|
|
|
@ -51,7 +51,6 @@
|
||||||
}
|
}
|
||||||
</style>
|
</style>
|
||||||
{% endif %}
|
{% endif %}
|
||||||
{% include "actionbar/media-css.html" %}
|
|
||||||
{% endblock %}
|
{% endblock %}
|
||||||
|
|
||||||
{% block three_col_js %}
|
{% block three_col_js %}
|
||||||
|
|
|
@ -1,7 +1,6 @@
|
||||||
{% extends "common-content.html" %}
|
{% extends "common-content.html" %}
|
||||||
{% block content_media %}
|
{% block content_media %}
|
||||||
{% include "comments/media-css.html" %}
|
{% include "comments/media-css.html" %}
|
||||||
{% include "actionbar/media-css.html" %}
|
|
||||||
<style>
|
<style>
|
||||||
.title-state {
|
.title-state {
|
||||||
font-size: 2em;
|
font-size: 2em;
|
||||||
|
|
Loading…
Reference in a new issue