Fix form class names and CSS.

diff --git a/src/main/resources/static/css/sone.css b/src/main/resources/static/css/sone.css
index f5250e3..371a86d 100644 (file)
--- a/src/main/resources/static/css/sone.css
+++ b/src/main/resources/static/css/sone.css
@@ -254,11 +254,17 @@ textarea {
        color: rgb(28, 131, 191);
 }
 
-#sone .post .bookmarks, #sone .post .bookmarked, #sone .post .not-bookmarked {
+#sone .post .bookmarks {
        display: inline;
        color: rgb(28, 131, 191);
 }
 
+#sone .post .bookmark, #sone .post .unbookmark {
+       display: inline;
+       font: inherit;
+       margin: 0px;
+}
+
 #sone .post .time {
        display: inline;
        color: #666;
@@ -274,11 +280,11 @@ textarea {
        display: none;
 }
 
-#sone .post .like.hidden, #sone .post .unlike.hidden, #sone .post .trust.hidden, #sone .post .distrust.hidden, #sone .post .untrust.hidden {
+#sone .post .like.hidden, #sone .post .unlike.hidden, #sone .post .trust.hidden, #sone .post .distrust.hidden, #sone .post .untrust.hidden, #sone .post .bookmark.hidden, #sone .post .unbookmark.hidden {
        display: none;
 }
 
-#sone .post .delete button, #sone .post .like button, #sone .post .unlike button, #sone .post .trust button, #sone .post .distrust button, #sone .post .untrust button {
+#sone .post .delete button, #sone .post .like button, #sone .post .unlike button, #sone .post .trust button, #sone .post .distrust button, #sone .post .untrust button, #sone .post .bookmark button, #sone .post .unbookmark button {
        border: 0px;
        background: none;
        padding: 0px;
@@ -304,7 +310,7 @@ textarea {
        color: rgb(64, 64, 64);
 }
 
-#sone .post .delete button:hover, #sone .post .like button:hover, #sone .post .unlike button:hover, #sone .post .trust button:hover, #sone .post .distrust button:hover, #sone .post .untrust button:hover {
+#sone .post .delete button:hover, #sone .post .like button:hover, #sone .post .unlike button:hover, #sone .post .trust button:hover, #sone .post .distrust button:hover, #sone .post .untrust button:hover, #sone .post .bookmark button:hover, #sone .post .unbookmark button:hover {
        border: 0px;
        background: none;
        padding: 0px;

diff --git a/src/main/resources/templates/include/viewPost.html b/src/main/resources/templates/include/viewPost.html
index 92fff0f..fd5846c 100644 (file)
--- a/src/main/resources/templates/include/viewPost.html
+++ b/src/main/resources/templates/include/viewPost.html
@@ -20,13 +20,13 @@
                </div>
                <div class="post-status-line status-line">
                        <div class="bookmarks">
-                               <form class="bookmarked<%if !post.bookmarked> hidden<%/if>" action="bookmark.html" method="post">
+                               <form class="unbookmark<%if !post.bookmarked> hidden<%/if>" action="unbookmark.html" method="post">
                                        <input type="hidden" name="formPassword" value="<% formPassword|html>" />
                                        <input type="hidden" name="returnPage" value="<% request.uri|html>" />
                                        <input type="hidden" name="post" value="<% post.id|html>" />
                                        <button type="submit" title="<%= View.Post.Bookmarks.PostIsBookmarked|l10n|html>">★</button>
                                </form>
-                               <form class="not-bookmarked<%if post.bookmarked> hidden<%/if>" action="unbookmark.html" method="post">
+                               <form class="bookmark<%if post.bookmarked> hidden<%/if>" action="bookmark.html" method="post">
                                        <input type="hidden" name="formPassword" value="<% formPassword|html>" />
                                        <input type="hidden" name="returnPage" value="<% request.uri|html>" />
                                        <input type="hidden" name="post" value="<% post.id|html>" />