cst1/openstreetmap-website
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

css in right place; fix structure.sql

Browse source
This commit is contained in:
Mikel Maron 2016-10-06 21:47:29 -04:00
parent e055eaf690
commit bb22e23dfb
3 changed files with 30 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

7
app/assets/stylesheets/common.scss
View file

@ -1679,6 +1679,13 @@ tr.turn:hover {
float: left;
}
.diary-subscribe-buttons {
position:relative;
top: -30px;
left: 130px;
}
/* Rules for the log in page */
#login_auth_buttons {

4
app/views/diary_entry/view.html.erb
View file

@ -22,9 +22,9 @@
<%= submit_tag t('diary_entry.view.save_button') %>
<% end %>
<% if @user and @entry.subscribers and @entry.subscribers.exists?(@user.id) %>
<div style='position:relative; top: -30px; left: 130px'><%= link_to t('javascripts.changesets.show.unsubscribe'), diary_entry_unsubscribe_path(:display_name => @entry.user.display_name, :id => @entry.id), :method => :post, :class => :button %></div>
<div class="diary-subscribe-buttons"><%= link_to t('javascripts.changesets.show.unsubscribe'), diary_entry_unsubscribe_path(:display_name => @entry.user.display_name, :id => @entry.id), :method => :post, :class => :button %></div>
<% elsif @user %>
<div style='position:relative; top: -30px; left: 130px'><%= link_to t('javascripts.changesets.show.subscribe'), diary_entry_subscribe_path(:display_name => @entry.user.display_name, :id => @entry.id), :method => :post, :class => :button %></div>
<div class="diary-subscribe-buttons"><%= link_to t('javascripts.changesets.show.subscribe'), diary_entry_subscribe_path(:display_name => @entry.user.display_name, :id => @entry.id), :method => :post, :class => :button %></div>
<% end %>
<% end %>

22
db/structure.sql
View file

@ -549,6 +549,14 @@ CREATE SEQUENCE diary_entries_id_seq
ALTER SEQUENCE diary_entries_id_seq OWNED BY diary_entries.id;
-- Name: diary_entry_subscriptions; Type: TABLE; Schema: public; Owner: -
--
CREATE TABLE diary_entry_subscriptions (
user_id bigint NOT NULL,
diary_entry_id bigint NOT NULL
);
--
-- Name: friends; Type: TABLE; Schema: public; Owner: -
@ -1828,6 +1836,19 @@ CREATE UNIQUE INDEX index_changesets_subscribers_on_subscriber_id_and_changeset_
CREATE UNIQUE INDEX index_client_applications_on_key ON client_applications USING btree (key);
-- Name: index_diary_entry_subscriptions_on_diary_entry_id; Type: INDEX; Schema: public; Owner: -
--
CREATE INDEX index_diary_entry_subscriptions_on_diary_entry_id ON diary_entry_subscriptions USING btree (diary_entry_id);
--
-- Name: index_diary_subscriptions_on_user_id_and_diary_entry_id; Type: INDEX; Schema: public; Owner: -
--
CREATE UNIQUE INDEX index_diary_subscriptions_on_user_id_and_diary_entry_id ON diary_entry_subscriptions USING btree (user_id, diary_entry_id);
--
-- Name: index_note_comments_on_body; Type: INDEX; Schema: public; Owner: -
--
@ -2643,4 +2664,3 @@ INSERT INTO schema_migrations (version) VALUES ('7');
INSERT INTO schema_migrations (version) VALUES ('8');
INSERT INTO schema_migrations (version) VALUES ('9');