@@ -4,7 +4,7 @@ %> <% if with_controls && logged_in? && current_user.can_edit?(post) %> - <p class="meta"> + <p class="postControls"> <%= link_to("Edit post", edit_post_url(post), :class => "option") %> <%= link_to("Delete post", post_url(post), :class => "option", :method => :delete, :confirm => "Are you sure you'd like to delete this post?") %> <%= link_to("Featuring...", "#featuring-controls")%> app/views/posts/_meta.html.erb @@ -46,24 +46,24 @@ <% if logged_in? && current_user.can_edit?(@post) %> <div id="featuring-controls"> - <h1>Featuring...</h1> <% if !@post.has_images?%> <p>(No images to feature).</p> <% else %> - <h2>Images to feature:</h2> + <h2>Feature images:</h2> + <p>You can feature images from a post on the group's page and on the main home page</p> <div class='image-controls'> <% @post.images.each do |image| %> - <span id="image-<%=image.id%>"> + <p id="image-<%=image.id%>"> <%= link_to image_tag_for(image, :medium_square), image.src, :title => "Open orignal image on remote site" %> <% if logged_in? && current_user.can_edit?(@post) %> - <%= link_to 'Delete?', image_path(image), :method=>:delete, :class=>'option', :confirm=>'Delete this image?' %> + <%= link_to 'Delete this image?', image_path(image), :method=>:delete, :class=>'admin', :confirm=>'Delete this image?' %> <% if image.featured? %> - <%= link_to 'Unfeature', unfeature_image_path(image), :method=>:put, :class=>'option' %> + <%= link_to 'Unfeature', unfeature_image_path(image), :method=>:put, :class=>'admin' %> <% else %> - <%= link_to 'Feature', feature_image_path(image), :method=>:put, :class=>'option' %> + <%= link_to 'Feature on group and home page', feature_image_path(image), :method=>:put, :class=>'admin' %> <% end %> <% end %> - </span> + </p> <% end %> <div class="clearThis"> </div> </div> @@ -72,17 +72,17 @@ <p>(No text to feature).</p> <% else %> <div> - <h2>Text (<%if @post.featured?%>featured<%else%>not featured<%end%></h2> + <h2>Feature text content: (<%if @post.featured?%>currently featured<%else%>currently not featured<%end%>)</h2> <div><p><%=plain_text(@post.text) %></p></div> <div class="clearThis"> </div> </div> <%if @post.featured?%> - <%= link_to("Unfeature post text", unfeature_post_url(@post), :class => "option", :method => :put) %> + <%= link_to("Unfeature post text", unfeature_post_url(@post), :class => "admin", :method => :put) %> <% else %> - <%= link_to("Feature post text", feature_post_url(@post), :class => "option", :method => :put) %> + <%= link_to("Feature post text", feature_post_url(@post), :class => "admin", :method => :put) %> <% end %> <% end %> - <%= link_to("Edit text", edit_post_url(@post), :class => "option") %> + <%= link_to("Edit text", edit_post_url(@post), :class => "admin") %> <% end %> </div> app/views/posts/show.html.erb @@ -264,6 +264,10 @@ div.largeForm textarea { width: 50%; } +div.largeForm select { + font-size: 1.5em; +} + div.largeForm .submitBlock { @@ -291,27 +295,6 @@ div.largeForm .submitBlock input[type="submit"] { /* @group Tags */ -p.tags { - color: #666; -} - - - -p.tags a.tag { - background-color: #dce9f5; - padding: 0.3em 0.7em; - -webkit-border-radius: 2px; - -moz-border-radius: 2px; - margin-left: 0.3em; -} - -div.tags a.tag { - float: left; -} - -a.tag:hover { - text-decoration: underline; -} a.delete { color: #999; @@ -325,52 +308,6 @@ a.delete:hover { /* @end */ -/* @group Tag Cloud */ - -div.tagCloud { - padding-bottom: 2em; -} - -ul.tagCloud { - list-style: none; - padding: 0px; - margin: 0px 0px 1em 0px; - line-height: 1.8em; -} - -.tagCloud li { - display: inline; - margin-right: 1em; -} - -ul.tagCloud a { - text-decoration: none; - word-spacing: -0.1em; -} - -.tagCloud a:hover { - text-decoration: underline; -} - -.tagCloud li.cloud1 a { - font-size: 100%; -} - -.tagCloud li.cloud2 a { - font-size: 140%; -} - -.tagCloud li.cloud3 a { - font-size: 170%; -} - -.tagCloud li.cloud4 a { - font-size: 200%; -} - -/* @end */ - - @@ -593,58 +530,59 @@ p#meta { } -#recentlyFeatured { -border-bottom: 1px dashed #DDD; -margin-bottom: 3em; +.postControls { + margin: 0 0 2em 0; } - -#recentlyFeatured h3 { - margin:0px; -} - -#recentlyFeatured div.post { - border-top: 1px dashed #DDD; - padding: 1em 0 0 0; +.postControls a, a.admin { + margin-right: 0.3em; + background-color: #999; + padding: 0.3em 0.5em; + -webkit-border-radius: 3px; + -moz-border-radius: 3px; + color: #FFF; + text-decoration: none; + font-size: 0.9em; } +div.image-controls img { + vertical-align: middle; + margin-right: 1em; +} - - - -#comments { - margin-top: 4em; +#featuring-controls { + margin-top: 3em; + background-color: #EEE; + padding: 1px 1.5em 2em 1.5em; } +div.image-controls { + border-bottom: 1px dashed #CCC; +} +div.image-controls p { + border-top: 1px dashed #CCC; + padding: 1em 0; + margin: 0; +} -#comments p.meta { - font-size: 1em; +#recentlyFeatured { +border-bottom: 1px dashed #DDD; +margin-bottom: 3em; } -.comment { - clear: left; +#recentlyFeatured h3 { + margin:0px; } -.comment p.avatar { - float: left; - padding-bottom: 2em; - text-align: center; - overflow: visible; - margin: 0px; +#recentlyFeatured div.post { + border-top: 1px dashed #DDD; + padding: 1em 0 0 0; } -.comment p.avatar img { - display: block; - margin-bottom: 0.5em; -} -.comment .postContent { - margin-left: 80px; - padding: 0.8em 0px 3em 3em; -} @@ -1180,13 +1118,6 @@ a.squareImage .inGroup { } - - -div.image-controls { - margin-top: 5em; - border-top: 1px dashed #DDD; - padding-top: 0.5em; -} div#flash { background-color: #FFF; @@ -1200,13 +1131,4 @@ div#flash p { text-align: center; } -div.image-controls span { - float: left; - margin: 0 10px 10px 0; -} - -div.image-controls a { - display: block; - margin-top: 0.3em; -} public/stylesheets/wminarch.css 60226553b65518f8944827fbe990f828d06ba042 Alexander Kohlhofer alex@alex.local http://github.com/red56/the-connected-website/commit/40dfd65fc1c38c9e96568a659ecf9a3912122df5 40dfd65fc1c38c9e96568a659ecf9a3912122df5 2009-06-10T05:52:18-07:00 2009-06-10T05:52:18-07:00 added styling and layout to post moderation and featuring e6b57d981c4cf26db2721e601115ed1ec921bc78 Alexander Kohlhofer alex@alex.local