Parent domain now defined in config.yml

nmanzi · Oct 9, 2011 · fb23398 · fb23398
1 parent 26c9bd7
commit fb23398
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 5 deletions.
diff --git a/README.md b/README.md
@@ -21,14 +21,17 @@ Config.yml
 ----------
 
 		development:
+			parent_domain: <parent domain>
 			username: <username>
 			password: <password>
 			
 		test:
+			parent_domain: <parent domain>
 			username: <username>
 			password: <password>
 			
 		production:
+			parent_domain: <parent domain>
 			username: <username>
 			password: <password>
 

diff --git a/app/views/links/_form.html.erb b/app/views/links/_form.html.erb
@@ -15,7 +15,7 @@
 		<div class="input">
 			<%= hidden_field_tag "default_subdomain", @default_subdomain %>
     	<%= f.text_field :subdomain, :placeholder => @default_subdomain, :value => (@link.subdomain unless @link.subdomain == @default_subdomain) %>
-			<span class="help-inline">Enter without the parent domain, e.g. subbysub NOT subbysub.hadric.us</span>
+			<span class="help-inline">Enter without the parent domain, e.g. subbysub NOT subbysub.<%= APP_CONFIG['parent_domain'] %></span>
 			<% @link.errors[:subdomain].each do |msg| %>
 				<span class="help-block"><%= msg.capitalize %>!</span>
 			<% end %>

diff --git a/app/views/links/edit.html.erb b/app/views/links/edit.html.erb
@@ -1,6 +1,6 @@
 <%= render :partial => 'errors' %>
 
-<div class="page-header"><h1>Editing Subdomain <small><%= @link.subdomain %>.hadric.us</small></h1></div>
+<div class="page-header"><h1>Editing Subdomain <small><%= "#{@link.subdomain}.#{APP_CONFIG['parent_domain']}" %></small></h1></div>
 
 <%= render 'form' %>
 
diff --git a/app/views/links/index.html.erb b/app/views/links/index.html.erb
@@ -12,7 +12,7 @@
 
 <% @links.each do |link| %>
   <tr>
-	  <td><%= link.subdomain %><span class="sublabel">.hadric.us</span></td>
+	  <td><%= link.subdomain %><span class="sublabel">.<%= APP_CONFIG['parent_domain'] %></span></td>
     <td><a href="<%= link.url %>"><%= link.url %></a></td>
 		<% if is_authed? %>
 			<td><%= link.visits %></td>
@@ -25,7 +25,7 @@
 	          <h3>Are you sure?</h3>
 	        </div>
 	        <div class="modal-body">
-	          <p>Really destroy subdomain <strong><%= link.subdomain %>.hadric.us</strong>?</p>
+	          <p>Really destroy subdomain <strong><%= "#{link.subdomain}.#{APP_CONFIG['parent_domain']}" %></strong>?</p>
 	        </div>
 	        <div class="modal-footer">
 	          <%= link_to 'Destroy', link, method: :delete, :class => "btn danger" %>

diff --git a/app/views/links/new.html.erb b/app/views/links/new.html.erb
@@ -1,5 +1,5 @@
 <%= render :partial => 'errors' %>
 
-<div class="page-header"><h1>New Subdomain <small>@ hadric.us</small></h1></div>
+<div class="page-header"><h1>New Subdomain <small>@ <%= APP_CONFIG['parent_domain'] %></small></h1></div>
 
 <%= render 'form' %>