Merge branch 'master' of github.com:resolve/Refinery

refinery · Sep 15, 2009 · c9780af · c9780af
2 parents 0cb0524 + d99800e
commit c9780af
Show file tree

Hide file tree

Showing 7 changed files with 38 additions and 10 deletions.
diff --git a/CONTRIBUTORS b/CONTRIBUTORS
@@ -0,0 +1,7 @@
+Major Contributors
+- djones - David Jones - www.d-jones.com www.resolvedigital.co.nz
+- parndt - Philip Arndt - www.resolvedigital.co.nz
+
+Minor Contriubtors
+- ryanwood - Ryan Wood - www.ryanwood.com
+
diff --git a/config/environment.rb b/config/environment.rb
@@ -59,4 +59,5 @@
   # 
 
   config.gem "unicode"
+
 end
diff --git a/public/stylesheets/refinery.css b/public/stylesheets/refinery.css
@@ -10,9 +10,11 @@ body {
 	font: 10px/1.5em Verdana;
 	background: black url('/images/refinery/page_bg.png') repeat;
 }
+
 div.login {
 	width: 300px !important;
 }
+
 div.login h1 {
 	margin: 0; 
 	padding: 5px; 
@@ -172,7 +174,7 @@ a:hover {
 #header ul#menu {
 	display: block;
 	margin: 0;
-	padding: 22px 15px 0 0;
+	padding: 32px 15px 0 0;
 }
 
 #header ul#menu li#logout {
@@ -230,10 +232,20 @@ pre {
 	position: relative;
 }
 
+#site_link {
+	display: block;
+	color: white;
+	float: left;
+}
+
+#site_link:hover {
+	text-decoration: underline;
+}
+
 #header #logo {
 	position: absolute;
-	right: 5px;
-	top: 29px;
+	right: 20px;
+	top: 25px;
 }
 
 #header h1 {
@@ -242,6 +254,7 @@ pre {
 	font-weight: normal;
 	margin-bottom: 0;
 	padding-bottom: 4px;
+	margin-top: 0;
 }
 
 #header p {

diff --git a/vendor/plugins/inquiries/app/views/admin/inquiries/index.html.erb b/vendor/plugins/inquiries/app/views/admin/inquiries/index.html.erb
@@ -22,6 +22,10 @@
 													{:title => "Move this inquiry to closed"} -%>
 							<%= link_to image_tag('refinery/icons/email_open.png'), {:action => 'show', :id => inquiry.id},
 							     				:title => "Read this inquiry" %>
+							<%= link_to image_tag('refinery/icons/delete.png'), admin_inquiry_url(inquiry),
+							                                                  :method => :delete, :class => "cancel",
+														                                    :confirm => "Are you sure you want to delete #{inquiry.name}?",
+														                                    :title => "Remove this inquiry forever" -%>
 						</span>
 						<%=h inquiry.name %> 
   					<span class="preview">

diff --git a/vendor/plugins/refinery/app/controllers/admin/refinery_core_controller.rb b/vendor/plugins/refinery/app/controllers/admin/refinery_core_controller.rb
@@ -8,5 +8,5 @@ def update_plugin_positions
   def render_flash_messages
     render :partial => "/shared/message"
   end
-  
+
 end
diff --git a/vendor/plugins/refinery/app/views/layouts/admin.html.erb b/vendor/plugins/refinery/app/views/layouts/admin.html.erb
@@ -5,11 +5,14 @@
 	<body>
 		<div id='page'<%= " class='login'" unless logged_in? %><%= " class='splash'" if logged_in? and params[:action] == "index" %>>
 			<div class='clearfix' id='header'>
-				<h1><%= just_installed? ? "Welcome to Refinery" : RefinerySetting[:site_name].titleize %></h1>
-			<% if logged_in? %>
-				<%= link_to image_tag("refinery/logo.png", :alt => "refinery (tm) content manager"), "http://www.refinerycms.com", :target => "_blank", :id => "logo" -%>
-				<%= render :partial => "/admin/menu" %>
-			<% end %>
+				<h1>
+				  <%= just_installed? ? "Welcome to Refinery" : RefinerySetting[:site_name].titleize %>
+				</h1>
+			  <%= link_to "View public site", "/", :target => "_blank", :id => "site_link" %>
+  			<% if logged_in? %>
+  				<%= link_to image_tag("refinery/logo.png", :alt => "refinery (tm) content manager"), "http://www.refinerycms.com", :target => "_blank", :id => "logo" -%>
+  				<%= render :partial => "/admin/menu" %>
+  			<% end %>
 			</div>
 			<div id='content' class='clearfix'>
 				<div id="flash_container">

diff --git a/vendor/plugins/refinery_settings/app/controllers/admin/refinery_settings_controller.rb b/vendor/plugins/refinery_settings/app/controllers/admin/refinery_settings_controller.rb
@@ -1,7 +1,7 @@
 class Admin::RefinerySettingsController < Admin::BaseController
 
   crudify :refinery_setting, :title_attribute => :title
-  
+
   def index
     @refinery_settings = RefinerySetting.paginate(:all, :order => "name ASC", :page => params[:page])
   end