diff --git a/app/assets/stylesheets/specific/posts.css.scss b/app/assets/stylesheets/specific/posts.css.scss
index 56de181de..1c15386ea 100644
--- a/app/assets/stylesheets/specific/posts.css.scss
+++ b/app/assets/stylesheets/specific/posts.css.scss
@@ -183,6 +183,22 @@ a.blacklisted-active {
}
div#c-posts {
+
+ #ugoira-controls {
+ div#seek-slider {
+ margin-top: 0.5em;
+ float: right;
+ }
+
+ #save-video-link {
+ margin: 0.5em 0;
+ }
+
+ button {
+ margin-top: 0.3em;
+ }
+ }
+
div.notice {
font-size: 0.8em;
padding: 0.5em;
@@ -521,18 +537,3 @@ div#unapprove-dialog {
width: 100%;
}
}
-
-#ugoira-controls {
- button {
- height: 2em;
- width: 5em;
- }
-
- #progressbar {
- height: 1.5em;
- }
-
- #seek-slider {
- margin: 0.5em 0 0.5em 0;
- }
-}
diff --git a/app/views/posts/partials/show/_ugoira.html.erb b/app/views/posts/partials/show/_ugoira.html.erb
index 2d1a28efa..ea628f54e 100644
--- a/app/views/posts/partials/show/_ugoira.html.erb
+++ b/app/views/posts/partials/show/_ugoira.html.erb
@@ -1,28 +1,33 @@
-<%= content_tag(:canvas, nil,
- :id => "image",
- :width => post.image_width,
- :height => post.image_height,
- "data-original-width" => post.image_width,
- "data-original-height" => post.image_height,
- "data-large-width" => post.image_width,
- "data-large-height" => post.image_height,
- "data-tags" => post.tag_string,
- "data-uploader" => post.uploader_name,
- "data-rating" => post.rating,
- "data-flags" => post.status_flags,
- "data-parent-id" => post.parent_id,
- "data-has-children" => post.has_children?,
- "data-has-active-children" => post.has_active_children?,
- "data-score" => post.score,
- "data-fav-count" => post.fav_count) %>
+<%= content_tag(
+ :canvas,
+ nil,
+ :id => "image",
+ :width => post.image_width,
+ :height => post.image_height,
+ "data-original-width" => post.image_width,
+ "data-original-height" => post.image_height,
+ "data-large-width" => post.image_width,
+ "data-large-height" => post.image_height,
+ "data-tags" => post.tag_string,
+ "data-uploader" => post.uploader_name,
+ "data-rating" => post.rating,
+ "data-flags" => post.status_flags,
+ "data-parent-id" => post.parent_id,
+ "data-has-children" => post.has_children?,
+ "data-has-active-children" => post.has_active_children?,
+ "data-score" => post.score,
+ "data-fav-count" => post.fav_count
+) %>
-
-
- <%= button_tag "Play", :id => "ugoira-play", :style => "display: none;" %>
- <%= button_tag "Pause", :id => "ugoira-pause" %>
- <%= button_tag "Rewind", :id => "ugoira-rewind" %>
- <%= link_to "Save as video (right click and save)", post.large_file_url %>
+
Loaded 0%
+
+ <%= button_tag "Rewind", :id => "ugoira-rewind" %>
+ <%= button_tag "Play", :id => "ugoira-play", :style => "display: none;" %>
+ <%= button_tag "Pause", :id => "ugoira-pause" %>
+
+
+
<%= link_to "Save as video (right click and save)", post.large_file_url %>
<% content_for(:html_header) do %>
@@ -52,11 +57,12 @@
$(function() {
Danbooru.Ugoira.create_player();
$(Danbooru.Ugoira.player).on("loadProgress", function(ev, progress) {
- $("#progressbar").progressbar({value: progress * 100});
+ $("#ugoira-load-percentage").val(progress * 100);
});
$(Danbooru.Ugoira.player).on("loadingStateChanged", function(ev, state) {
if (state === 2) {
- $("#progressbar").remove();
+ $("#ugoira-load-progress").remove();
+ $("#seek-slider").show();
}
});
diff --git a/db/structure.sql b/db/structure.sql
index bed47fab6..a138e8e52 100644
--- a/db/structure.sql
+++ b/db/structure.sql
@@ -3,6 +3,7 @@
--
SET statement_timeout = 0;
+SET lock_timeout = 0;
SET client_encoding = 'UTF8';
SET standard_conforming_strings = on;
SET check_function_bodies = false;
@@ -421,8 +422,8 @@ CREATE TABLE advertisement_hits (
id integer NOT NULL,
advertisement_id integer NOT NULL,
ip_addr inet NOT NULL,
- created_at timestamp without time zone NOT NULL,
- updated_at timestamp without time zone NOT NULL
+ created_at timestamp without time zone,
+ updated_at timestamp without time zone
);
@@ -459,8 +460,8 @@ CREATE TABLE advertisements (
height integer NOT NULL,
file_name character varying(255) NOT NULL,
is_work_safe boolean DEFAULT false NOT NULL,
- created_at timestamp without time zone NOT NULL,
- updated_at timestamp without time zone NOT NULL
+ created_at timestamp without time zone,
+ updated_at timestamp without time zone
);
@@ -490,8 +491,8 @@ ALTER SEQUENCE advertisements_id_seq OWNED BY advertisements.id;
CREATE TABLE amazon_backups (
id integer NOT NULL,
last_id integer,
- created_at timestamp without time zone NOT NULL,
- updated_at timestamp without time zone NOT NULL
+ created_at timestamp without time zone,
+ updated_at timestamp without time zone
);
@@ -557,8 +558,8 @@ CREATE TABLE artist_commentaries (
original_description text,
translated_title text,
translated_description text,
- created_at timestamp without time zone NOT NULL,
- updated_at timestamp without time zone NOT NULL
+ created_at timestamp without time zone,
+ updated_at timestamp without time zone
);
@@ -594,8 +595,8 @@ CREATE TABLE artist_commentary_versions (
original_description text,
translated_title text,
translated_description text,
- created_at timestamp without time zone NOT NULL,
- updated_at timestamp without time zone NOT NULL
+ created_at timestamp without time zone,
+ updated_at timestamp without time zone
);
@@ -627,8 +628,8 @@ CREATE TABLE artist_urls (
artist_id integer NOT NULL,
url text NOT NULL,
normalized_url text NOT NULL,
- created_at timestamp without time zone NOT NULL,
- updated_at timestamp without time zone NOT NULL
+ created_at timestamp without time zone,
+ updated_at timestamp without time zone
);
@@ -666,8 +667,8 @@ CREATE TABLE artist_versions (
group_name character varying(255),
url_string text,
is_banned boolean DEFAULT false NOT NULL,
- created_at timestamp without time zone NOT NULL,
- updated_at timestamp without time zone NOT NULL
+ created_at timestamp without time zone,
+ updated_at timestamp without time zone
);
@@ -703,8 +704,8 @@ CREATE TABLE artists (
other_names text,
other_names_index tsvector,
group_name character varying(255),
- created_at timestamp without time zone NOT NULL,
- updated_at timestamp without time zone NOT NULL
+ created_at timestamp without time zone,
+ updated_at timestamp without time zone
);
@@ -737,8 +738,8 @@ CREATE TABLE bans (
reason text NOT NULL,
banner_id integer NOT NULL,
expires_at timestamp without time zone NOT NULL,
- created_at timestamp without time zone NOT NULL,
- updated_at timestamp without time zone NOT NULL
+ created_at timestamp without time zone,
+ updated_at timestamp without time zone
);
@@ -804,8 +805,8 @@ CREATE TABLE comment_votes (
comment_id integer NOT NULL,
user_id integer NOT NULL,
score integer NOT NULL,
- created_at timestamp without time zone NOT NULL,
- updated_at timestamp without time zone NOT NULL
+ created_at timestamp without time zone,
+ updated_at timestamp without time zone
);
@@ -840,8 +841,8 @@ CREATE TABLE comments (
ip_addr inet NOT NULL,
body_index tsvector NOT NULL,
score integer DEFAULT 0 NOT NULL,
- created_at timestamp without time zone NOT NULL,
- updated_at timestamp without time zone NOT NULL,
+ created_at timestamp without time zone,
+ updated_at timestamp without time zone,
updater_id integer,
updater_ip_addr inet,
do_not_bump_post boolean DEFAULT false NOT NULL
@@ -881,8 +882,8 @@ CREATE TABLE delayed_jobs (
locked_at timestamp without time zone,
failed_at timestamp without time zone,
locked_by character varying(255),
- created_at timestamp without time zone NOT NULL,
- updated_at timestamp without time zone NOT NULL,
+ created_at timestamp without time zone,
+ updated_at timestamp without time zone,
queue character varying(255)
);
@@ -920,8 +921,8 @@ CREATE TABLE dmails (
message_index tsvector NOT NULL,
is_read boolean DEFAULT false NOT NULL,
is_deleted boolean DEFAULT false NOT NULL,
- created_at timestamp without time zone NOT NULL,
- updated_at timestamp without time zone NOT NULL,
+ created_at timestamp without time zone,
+ updated_at timestamp without time zone,
creator_ip_addr inet DEFAULT '127.0.0.1'::inet NOT NULL
);
@@ -1987,8 +1988,8 @@ CREATE TABLE forum_posts (
body text NOT NULL,
text_index tsvector NOT NULL,
is_deleted boolean DEFAULT false NOT NULL,
- created_at timestamp without time zone NOT NULL,
- updated_at timestamp without time zone NOT NULL
+ created_at timestamp without time zone,
+ updated_at timestamp without time zone
);
@@ -2090,8 +2091,8 @@ CREATE TABLE forum_topics (
is_locked boolean DEFAULT false NOT NULL,
is_deleted boolean DEFAULT false NOT NULL,
text_index tsvector NOT NULL,
- created_at timestamp without time zone NOT NULL,
- updated_at timestamp without time zone NOT NULL,
+ created_at timestamp without time zone,
+ updated_at timestamp without time zone,
category_id integer DEFAULT 0 NOT NULL
);
@@ -2124,8 +2125,8 @@ CREATE TABLE ip_bans (
creator_id integer NOT NULL,
ip_addr inet NOT NULL,
reason text NOT NULL,
- created_at timestamp without time zone NOT NULL,
- updated_at timestamp without time zone NOT NULL
+ created_at timestamp without time zone,
+ updated_at timestamp without time zone
);
@@ -2157,8 +2158,8 @@ CREATE TABLE janitor_trials (
creator_id integer NOT NULL,
user_id integer NOT NULL,
original_level integer NOT NULL,
- created_at timestamp without time zone NOT NULL,
- updated_at timestamp without time zone NOT NULL
+ created_at timestamp without time zone,
+ updated_at timestamp without time zone
);
@@ -2189,8 +2190,8 @@ CREATE TABLE key_values (
id integer NOT NULL,
key character varying(255) NOT NULL,
value text,
- created_at timestamp without time zone NOT NULL,
- updated_at timestamp without time zone NOT NULL
+ created_at timestamp without time zone,
+ updated_at timestamp without time zone
);
@@ -2221,8 +2222,8 @@ CREATE TABLE mod_actions (
id integer NOT NULL,
creator_id integer NOT NULL,
description text NOT NULL,
- created_at timestamp without time zone NOT NULL,
- updated_at timestamp without time zone NOT NULL
+ created_at timestamp without time zone,
+ updated_at timestamp without time zone
);
@@ -2254,8 +2255,8 @@ CREATE TABLE news_updates (
message text NOT NULL,
creator_id integer NOT NULL,
updater_id integer NOT NULL,
- created_at timestamp without time zone NOT NULL,
- updated_at timestamp without time zone NOT NULL
+ created_at timestamp without time zone,
+ updated_at timestamp without time zone
);
@@ -2294,8 +2295,8 @@ CREATE TABLE note_versions (
height integer NOT NULL,
is_active boolean DEFAULT true NOT NULL,
body text NOT NULL,
- created_at timestamp without time zone NOT NULL,
- updated_at timestamp without time zone NOT NULL,
+ created_at timestamp without time zone,
+ updated_at timestamp without time zone,
version integer DEFAULT 0 NOT NULL
);
@@ -2334,8 +2335,8 @@ CREATE TABLE notes (
is_active boolean DEFAULT true NOT NULL,
body text NOT NULL,
body_index tsvector NOT NULL,
- created_at timestamp without time zone NOT NULL,
- updated_at timestamp without time zone NOT NULL,
+ created_at timestamp without time zone,
+ updated_at timestamp without time zone,
version integer DEFAULT 0 NOT NULL
);
@@ -2400,8 +2401,8 @@ CREATE TABLE pool_versions (
post_ids text DEFAULT ''::text NOT NULL,
updater_id integer NOT NULL,
updater_ip_addr inet NOT NULL,
- created_at timestamp without time zone NOT NULL,
- updated_at timestamp without time zone NOT NULL,
+ created_at timestamp without time zone,
+ updated_at timestamp without time zone,
name character varying(255)
);
@@ -2438,8 +2439,8 @@ CREATE TABLE pools (
post_ids text DEFAULT ''::text NOT NULL,
post_count integer DEFAULT 0 NOT NULL,
is_deleted boolean DEFAULT false NOT NULL,
- created_at timestamp without time zone NOT NULL,
- updated_at timestamp without time zone NOT NULL,
+ created_at timestamp without time zone,
+ updated_at timestamp without time zone,
category character varying(255) DEFAULT 'series'::character varying NOT NULL
);
@@ -2473,8 +2474,8 @@ CREATE TABLE post_appeals (
creator_id integer NOT NULL,
creator_ip_addr integer NOT NULL,
reason text,
- created_at timestamp without time zone NOT NULL,
- updated_at timestamp without time zone NOT NULL
+ created_at timestamp without time zone,
+ updated_at timestamp without time zone
);
@@ -2505,8 +2506,8 @@ CREATE TABLE post_disapprovals (
id integer NOT NULL,
user_id integer NOT NULL,
post_id integer NOT NULL,
- created_at timestamp without time zone NOT NULL,
- updated_at timestamp without time zone NOT NULL
+ created_at timestamp without time zone,
+ updated_at timestamp without time zone
);
@@ -2540,8 +2541,8 @@ CREATE TABLE post_flags (
creator_ip_addr inet NOT NULL,
reason text,
is_resolved boolean DEFAULT false NOT NULL,
- created_at timestamp without time zone NOT NULL,
- updated_at timestamp without time zone NOT NULL
+ created_at timestamp without time zone,
+ updated_at timestamp without time zone
);
@@ -2570,8 +2571,8 @@ ALTER SEQUENCE post_flags_id_seq OWNED BY post_flags.id;
CREATE TABLE post_versions (
id integer NOT NULL,
- created_at timestamp without time zone NOT NULL,
- updated_at timestamp without time zone NOT NULL,
+ created_at timestamp without time zone,
+ updated_at timestamp without time zone,
post_id integer NOT NULL,
tags text DEFAULT ''::text NOT NULL,
rating character(1),
@@ -2610,8 +2611,8 @@ CREATE TABLE post_votes (
post_id integer NOT NULL,
user_id integer NOT NULL,
score integer NOT NULL,
- created_at timestamp without time zone NOT NULL,
- updated_at timestamp without time zone NOT NULL
+ created_at timestamp without time zone,
+ updated_at timestamp without time zone
);
@@ -2640,8 +2641,8 @@ ALTER SEQUENCE post_votes_id_seq OWNED BY post_votes.id;
CREATE TABLE posts (
id integer NOT NULL,
- created_at timestamp without time zone NOT NULL,
- updated_at timestamp without time zone NOT NULL,
+ created_at timestamp without time zone,
+ updated_at timestamp without time zone,
up_score integer DEFAULT 0 NOT NULL,
down_score integer DEFAULT 0 NOT NULL,
score integer DEFAULT 0 NOT NULL,
@@ -2756,8 +2757,8 @@ CREATE TABLE tag_aliases (
creator_ip_addr inet NOT NULL,
forum_topic_id integer,
status text DEFAULT 'pending'::text NOT NULL,
- created_at timestamp without time zone NOT NULL,
- updated_at timestamp without time zone NOT NULL
+ created_at timestamp without time zone,
+ updated_at timestamp without time zone
);
@@ -2793,8 +2794,8 @@ CREATE TABLE tag_implications (
creator_ip_addr inet NOT NULL,
forum_topic_id integer,
status text DEFAULT 'pending'::text NOT NULL,
- created_at timestamp without time zone NOT NULL,
- updated_at timestamp without time zone NOT NULL
+ created_at timestamp without time zone,
+ updated_at timestamp without time zone
);
@@ -2830,8 +2831,8 @@ CREATE TABLE tag_subscriptions (
is_public boolean DEFAULT true NOT NULL,
last_accessed_at timestamp without time zone,
is_opted_in boolean DEFAULT false NOT NULL,
- created_at timestamp without time zone NOT NULL,
- updated_at timestamp without time zone NOT NULL
+ created_at timestamp without time zone,
+ updated_at timestamp without time zone
);
@@ -2865,8 +2866,8 @@ CREATE TABLE tags (
category integer DEFAULT 0 NOT NULL,
related_tags text,
related_tags_updated_at timestamp without time zone,
- created_at timestamp without time zone NOT NULL,
- updated_at timestamp without time zone NOT NULL,
+ created_at timestamp without time zone,
+ updated_at timestamp without time zone,
is_locked boolean DEFAULT false NOT NULL
);
@@ -2899,8 +2900,8 @@ CREATE TABLE transaction_log_items (
category character varying(255),
user_id integer,
data text,
- created_at timestamp without time zone NOT NULL,
- updated_at timestamp without time zone NOT NULL
+ created_at timestamp without time zone,
+ updated_at timestamp without time zone
);
@@ -2940,8 +2941,8 @@ CREATE TABLE uploads (
backtrace text,
post_id integer,
md5_confirmation character varying(255),
- created_at timestamp without time zone NOT NULL,
- updated_at timestamp without time zone NOT NULL,
+ created_at timestamp without time zone,
+ updated_at timestamp without time zone,
server text,
parent_id integer
);
@@ -2976,8 +2977,8 @@ CREATE TABLE user_feedback (
creator_id integer NOT NULL,
category character varying(255) NOT NULL,
body text NOT NULL,
- created_at timestamp without time zone NOT NULL,
- updated_at timestamp without time zone NOT NULL
+ created_at timestamp without time zone,
+ updated_at timestamp without time zone
);
@@ -3013,8 +3014,8 @@ CREATE TABLE user_name_change_requests (
desired_name character varying(255),
change_reason text,
rejection_reason text,
- created_at timestamp without time zone NOT NULL,
- updated_at timestamp without time zone NOT NULL
+ created_at timestamp without time zone,
+ updated_at timestamp without time zone
);
@@ -3045,8 +3046,8 @@ CREATE TABLE user_password_reset_nonces (
id integer NOT NULL,
key character varying(255) NOT NULL,
email character varying(255) NOT NULL,
- created_at timestamp without time zone NOT NULL,
- updated_at timestamp without time zone NOT NULL
+ created_at timestamp without time zone,
+ updated_at timestamp without time zone
);
@@ -3075,8 +3076,8 @@ ALTER SEQUENCE user_password_reset_nonces_id_seq OWNED BY user_password_reset_no
CREATE TABLE users (
id integer NOT NULL,
- created_at timestamp without time zone NOT NULL,
- updated_at timestamp without time zone NOT NULL,
+ created_at timestamp without time zone,
+ updated_at timestamp without time zone,
name character varying(255) NOT NULL,
password_hash character varying(255) NOT NULL,
email character varying(255),
@@ -3134,8 +3135,8 @@ CREATE TABLE wiki_page_versions (
title character varying(255) NOT NULL,
body text NOT NULL,
is_locked boolean NOT NULL,
- created_at timestamp without time zone NOT NULL,
- updated_at timestamp without time zone NOT NULL,
+ created_at timestamp without time zone,
+ updated_at timestamp without time zone,
other_names text
);
@@ -3170,8 +3171,8 @@ CREATE TABLE wiki_pages (
body text NOT NULL,
body_index tsvector NOT NULL,
is_locked boolean DEFAULT false NOT NULL,
- created_at timestamp without time zone NOT NULL,
- updated_at timestamp without time zone NOT NULL,
+ created_at timestamp without time zone,
+ updated_at timestamp without time zone,
updater_id integer,
other_names text,
other_names_index tsvector
@@ -6298,13 +6299,6 @@ CREATE INDEX index_forum_subscriptions_on_user_id ON forum_subscriptions USING b
CREATE INDEX index_forum_topic_visits_on_forum_topic_id ON forum_topic_visits USING btree (forum_topic_id);
---
--- Name: index_forum_topic_visits_on_last_read_at; Type: INDEX; Schema: public; Owner: -; Tablespace:
---
-
-CREATE INDEX index_forum_topic_visits_on_last_read_at ON forum_topic_visits USING btree (last_read_at);
-
-
--
-- Name: index_forum_topic_visits_on_user_id; Type: INDEX; Schema: public; Owner: -; Tablespace:
--