css in right place; fix structure.sql

diff --git a/app/assets/stylesheets/common.scss b/app/assets/stylesheets/common.scss
index e8c480f56b6e6cf416a4f9118cb7ec5d82a675e8..7e7940d35847aaa15af8dd0f9325f9ffcbf980f1 100644 (file)
--- a/app/assets/stylesheets/common.scss
+++ b/app/assets/stylesheets/common.scss
@@ -1679,6 +1679,13 @@ tr.turn:hover {
   float: left;
 }
 
   float: left;
 }
 

+
+.diary-subscribe-buttons {
+  position:relative;
+  top: -30px;
+  left: 130px;
+}
+

 /* Rules for the log in page */
 
 #login_auth_buttons {
 /* Rules for the log in page */
 
 #login_auth_buttons {

diff --git a/app/views/diary_entry/view.html.erb b/app/views/diary_entry/view.html.erb
index 3e96869222f91eb6ccc9b3a41b7fab6aac6e7a89..b1159195de8187995949da5cb3b679c420460969 100644 (file)
--- a/app/views/diary_entry/view.html.erb
+++ b/app/views/diary_entry/view.html.erb
@@ -22,9 +22,9 @@
     <%= submit_tag t('diary_entry.view.save_button') %>
   <% end %>
   <% if @user and @entry.subscribers and @entry.subscribers.exists?(@user.id) %>
     <%= 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 %>
   <% 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 %>
 
   <% end %>
 <% end %>
 

diff --git a/db/structure.sql b/db/structure.sql
index cbed6c8ce80282c9be456bb85366202d4e115842..a3e80ba45f83c68f0e16fbb8ccc7aeb4abdcc116 100644 (file)
--- a/db/structure.sql
+++ b/db/structure.sql
@@ -549,6 +549,14 @@ CREATE SEQUENCE diary_entries_id_seq
 
 ALTER SEQUENCE diary_entries_id_seq OWNED BY diary_entries.id;
 
 
 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: -
 
 --
 -- 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);
 
 
 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: -
 --
 --
 -- 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');
 INSERT INTO schema_migrations (version) VALUES ('8');
 
 INSERT INTO schema_migrations (version) VALUES ('9');

-