<%= link_to "» Back to Project Home", project_path(project_param) %>
diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb index 323f214..8c59b4f 100644 --- a/app/views/layouts/application.html.erb +++ b/app/views/layouts/application.html.erb @@ -1,7 +1,7 @@ - - + + +
- 
+
+
-
<% if logged_in? %>
- <%= link_to "Projects", projects_url %>
- <%= link_to "Log Out", logout_url %> <% else %>
- <%= link_to "Join", signup_url %> -
- <%= link_to "Log In", login_url + "?width=420&height=400", :class=> "thickbox" %> +
- <%= link_to "Log In", login_url + "?width=420&height=400", :class=> "thickbox" %> <% end %>
- <%= link_to "About", about_url %>
- <%= link_to "Tour", tour_url %> diff --git a/app/views/links/_latest.html.erb b/app/views/links/_latest.html.erb index 8c646e2..a91291f 100644 --- a/app/views/links/_latest.html.erb +++ b/app/views/links/_latest.html.erb @@ -1,5 +1,5 @@
- This project has no photos. <% end %> diff --git a/app/views/projects/_form.html.erb b/app/views/projects/_form.html.erb index ff8eb43..7c2a9a4 100644 --- a/app/views/projects/_form.html.erb +++ b/app/views/projects/_form.html.erb @@ -10,7 +10,7 @@ <%= f.label :description %> <%= f.text_area :description, :rows => 6 %> -
- This project has no screenshots. <% end %> diff --git a/public/images/logo.jpg b/public/images/logo.jpg index d255c9b..d20fc34 100644 Binary files a/public/images/logo.jpg and b/public/images/logo.jpg differ diff --git a/public/stylesheets/application.css b/public/stylesheets/application.css index 5a1123e..f616095 100644 --- a/public/stylesheets/application.css +++ b/public/stylesheets/application.css @@ -98,6 +98,8 @@ body .colorwell-selected { border: 1px solid #000; font-weight: bold; } #sidebar .linklist li a:hover { background-position:bottom left; } .hidden { display:none; } +.managelist, #left_col .linklist { border-top:1px solid #adc8cf; } +#left_col div .linklist { border-top:none; } .managelist li { height:64px; } .managelist .tinythumb { background:#abc6cd; width:64px; height:64px; margin-right:10px; float:left; } .managelist span.info { display:block; height:64px; line-height:64px; font-size:12pt; width:450px; float:left; } @@ -116,4 +118,9 @@ h1.main_title a { background:#fffba8; color:#333; } .col a { text-decoration:underline; } .col form { margin:10px 20px 10px 20px; border:5px solid #d2e1e4; } .col form p.align_right { padding-right:20px; } - .col form fieldset input { width:150px; } \ No newline at end of file + .col form fieldset input { width:150px; } +.pagination { clear:both; padding-top:10px; margin-top:10px; } +.pagination .disabled { display:block; float:left; background:#d2e1e4; color:#fff; padding:3px 5px; margin-right:5px; } +.pagination .current { display:block; background:#357fa6; float:left; color:#fff; padding:3px 5px; margin-right:5px; } +.pagination a { display:block; float:left; color:#fff; background:#adc8cf; padding:3px 5px; margin-right:5px; } +.pagination a:hover { background:#9c0a0d; text-decoration:none; }
-
Links: (<%= current_project.links.count %>)<% if owner? %><%= link_to image_tag("/images/new_link_btn.png", :alt=>"New Link"), new_project_link_path(project_param) + "?width=630&height=250", :class => "thickbox" %><% end %>
+Links: (<%= current_project.links.count %>)<% if owner? %><%= link_to image_tag("/images/new_link_btn.png", :alt=>"New Link"), new_project_link_path(project_param) + "?width=630&height=250", :class => "thickbox" %> <%= link_to image_tag("/images/manage_btn.png", :alt=>"Manage Links"), project_links_path(project_param) %><% end %>
-
<%
if current_project.links.count > 0
diff --git a/app/views/links/index.html.erb b/app/views/links/index.html.erb
index 7023f3b..fdd5d99 100644
--- a/app/views/links/index.html.erb
+++ b/app/views/links/index.html.erb
@@ -1,7 +1,7 @@
<% title "Browse Links for: " + current_project.name %>
\ No newline at end of file
diff --git a/app/views/photos/_form.html.erb b/app/views/photos/_form.html.erb
index 63d13f7..c24c3f2 100644
--- a/app/views/photos/_form.html.erb
+++ b/app/views/photos/_form.html.erb
@@ -9,5 +9,5 @@
<%= f.label :image %>
<%= f.file_field :image %>
- <%= yield(:title) %>
- <% if owner? %><%= link_to image_tag("/images/new_link_btn.png", :alt=>"New Link"), new_project_link_path(project_param) + "?width=630&height=250", :class => "thickbox" %> <% end %> + <% if owner? %><%= link_to image_tag("/images/new_link_btn.png", :alt=>"New Link"), new_project_link_path(project_param) + "?width=630&height=250", :class => "thickbox" %> <% end %>-
<%
if current_project.links.count > 0
diff --git a/app/views/notes/_form.html.erb b/app/views/notes/_form.html.erb
index 0e63938..3cf8c8e 100644
--- a/app/views/notes/_form.html.erb
+++ b/app/views/notes/_form.html.erb
@@ -8,8 +8,8 @@
-
<%= f.submit "Submit" %>
+<%= f.submit "Save Note" %>
<% end %><%= f.submit "Submit" %>
+<%= f.submit "Upload Photo" %>
<% end %> diff --git a/app/views/photos/_latest.html.erb b/app/views/photos/_latest.html.erb index 85ddbd2..5736d19 100644 --- a/app/views/photos/_latest.html.erb +++ b/app/views/photos/_latest.html.erb @@ -1,9 +1,9 @@
-
Photos: (<%= current_project.photos.count %>)<% if owner? %><%= link_to image_tag("/images/new_photo_btn.png", :alt=>"New Photo"), new_project_photo_path(project_param) + "?width=510&height=230", :class => "thickbox" %> <%= link_to image_tag("/images/manage_btn.png", :alt=>"Manage Photos"), manage_project_photos_path(project_param) %><% end %>
+Photos: (<%= current_project.photos.count %>)<% if owner? %><%= link_to image_tag("/images/new_photo_btn.png", :alt=>"New Photo"), new_project_photo_path(project_param) + "?width=510&height=230", :class => "thickbox" %> <%= link_to image_tag("/images/manage_btn.png", :alt=>"Manage Photos"), manage_project_photos_path(project_param) %><% end %>
<% if current_project.photos.count > 0 for photo in current_project.photos.recent(3) %> -
+
<%= link_to image_tag(photo.image.url(:small)), photo.image.url, :class => "thickbox", :rel => current_project.name %>
diff --git a/app/views/photos/index.html.erb b/app/views/photos/index.html.erb
index 00e07d4..322b17d 100644
--- a/app/views/photos/index.html.erb
+++ b/app/views/photos/index.html.erb
@@ -1,12 +1,12 @@
<%= photo.name %>
<%= photo.created_at.strftime("%b, %d %Y at %I:%M %p") %>
<%= photo.created_at.strftime("%b, %d %Y at %I:%M %p") %>
<% title "Browse Photos for: " + current_project.name %>
<% if current_project.photos.count > 0 for photo in current_project.photos %> -
<%= yield(:title) %>
- <% if owner? %><%= link_to image_tag("/images/new_photo_btn.png", :alt=>"New Photo"), new_project_photo_path(project_param) + "?width=510&height=230", :class=> "thickbox" %> <%= link_to image_tag("/images/manage_btn.png", :alt=>"Manage Photos"), manage_project_photos_path(project_param) %><% end %> + <% if owner? %><%= link_to image_tag("/images/new_photo_btn.png", :alt=>"New Photo"), new_project_photo_path(project_param) + "?width=510&height=230", :class=> "thickbox" %> <%= link_to image_tag("/images/manage_btn.png", :alt=>"Manage Photos"), manage_project_photos_path(project_param) %><% end %><% if current_project.photos.count > 0 for photo in current_project.photos %> -
+
diff --git a/app/views/screenshots/_latest.html.erb b/app/views/screenshots/_latest.html.erb
index cabd853..9713f63 100644
--- a/app/views/screenshots/_latest.html.erb
+++ b/app/views/screenshots/_latest.html.erb
@@ -1,9 +1,9 @@
<%= link_to image_tag(photo.image.url(:small)), photo.image.url, :class => "thickbox", :rel => current_project.name %>
diff --git a/app/views/photos/manage.html.erb b/app/views/photos/manage.html.erb
index 17a67ea..752a20c 100644
--- a/app/views/photos/manage.html.erb
+++ b/app/views/photos/manage.html.erb
@@ -1,7 +1,7 @@
<%= photo.name %>
<%= photo.created_at.strftime("%b, %d %Y at %I:%M %p") %>
<%= photo.created_at.strftime("%b, %d %Y at %I:%M %p") %>
<% title "Manage Photos for: " + current_project.name %>
diff --git a/app/views/screenshots/_form.html.erb b/app/views/screenshots/_form.html.erb
index c68fbb3..99db2bb 100644
--- a/app/views/screenshots/_form.html.erb
+++ b/app/views/screenshots/_form.html.erb
@@ -10,7 +10,7 @@
<%= f.label :source_url %>
<%= f.text_field :source_url %>
- <%= yield(:title) %>
- <% if owner? %><%= link_to image_tag("/images/new_photo_btn.png", :alt=>"New Photo"), new_project_photo_path(project_param) + "?width=510&height=230", :class=> "thickbox" %><% end %> + <% if owner? %><%= link_to image_tag("/images/new_photo_btn.png", :alt=>"New Photo"), new_project_photo_path(project_param) + "?width=510&height=230", :class=> "thickbox" %><% end %>-
<%
if current_project.photos.count > 0
@@ -10,9 +10,9 @@
<%= image_tag photo.image.url(:tiny), :class => "tinythumb" %>
<%= link_to photo.name, photo.image.url %> <%= photo.created_at.strftime("%b, %d %Y at %I:%M %p") %>
<%= link_to image_tag("/images/delete_photo_btn.png", :alt => "Delete Photo"), [current_project, photo], :confirm => 'Are you sure?', :method => :delete, :class => "del_btn" %>
+
<%= f.submit "Submit" %>
+<%= f.submit "Save Project" %>
<% end %><%= f.submit "Submit" %>
+<%= f.submit "Take Screenshot" %>
<% end %>
-
Photos: (<%= current_project.screenshots.count %>)<% if owner? %><%= link_to image_tag("/images/new_screenshot_btn.png", :alt=>"New Screenshot"), new_project_screenshot_path(project_param) + "?width=410&height=230", :class => "thickbox" %> <%= link_to image_tag("/images/manage_btn.png", :alt=>"Manage Screenshots"), manage_project_screenshots_path(project_param) %><% end %>
+Photos: (<%= current_project.screenshots.count %>)<% if owner? %><%= link_to image_tag("/images/new_screenshot_btn.png", :alt=>"New Screenshot"), new_project_screenshot_path(project_param) + "?width=410&height=230", :class => "thickbox" %> <%= link_to image_tag("/images/manage_btn.png", :alt=>"Manage Screenshots"), manage_project_screenshots_path(project_param) %><% end %>
<% if current_project.screenshots.count > 0 for screenshot in current_project.screenshots.recent(3) %> -
+
<%= link_to image_tag(screenshot.image_url(150)), screenshot.source_url %>
diff --git a/app/views/screenshots/index.html.erb b/app/views/screenshots/index.html.erb
index fc6f5b2..d44c8df 100644
--- a/app/views/screenshots/index.html.erb
+++ b/app/views/screenshots/index.html.erb
@@ -6,7 +6,7 @@
<%
if current_project.screenshots.count > 0
for screenshot in current_project.screenshots %>
- <%= screenshot.name %>
<%= screenshot.created_at.strftime("%b, %d %Y at %I:%M %p") %>
<%= screenshot.created_at.strftime("%b, %d %Y at %I:%M %p") %>
+
<%= link_to image_tag(screenshot.image_url(300)), screenshot.source_url %> <%= link_to image_tag("/images/manage_btn.png", :alt=>"Manage Photos"), manage_project_screenshots_path(project_param) %>
diff --git a/app/views/screenshots/manage.html.erb b/app/views/screenshots/manage.html.erb
index 4fc42eb..2da4808 100644
--- a/app/views/screenshots/manage.html.erb
+++ b/app/views/screenshots/manage.html.erb
@@ -1,7 +1,7 @@
<%= screenshot.name %>
<%= screenshot.created_at.strftime("%b, %d %Y at %I:%M %p") %>
<%= screenshot.created_at.strftime("%b, %d %Y at %I:%M %p") %>
<% title "Manage Screenshots for: " + current_project.name %>
<%= yield(:title) %>
- <% if owner? %><%= link_to image_tag("/images/new_screenshot_btn.png", :alt=>"New Screenshot"), new_project_screenshot_path(project_param) + "?width=410&height=230", :class => "thickbox" %> <%= link_to image_tag("/images/manage_btn.png", :alt=>"Manage Photos"), manage_project_screenshots_path(project_param) %><% end %> + <% if owner? %><%= link_to image_tag("/images/new_screenshot_btn.png", :alt=>"New Screenshot"), new_project_screenshot_path(project_param) + "?width=410&height=230", :class => "thickbox" %> <%= link_to image_tag("/images/manage_btn.png", :alt=>"Manage Photos"), manage_project_screenshots_path(project_param) %><% end %>-
<%
if current_project.screenshots.count > 0
@@ -10,9 +10,9 @@
<%= image_tag screenshot.image_url(64), :class => "tinythumb" %>
<%= link_to screenshot.name, screenshot.source_url %> <%= screenshot.created_at.strftime("%b, %d %Y at %I:%M %p") %>
<%= link_to image_tag("/images/delete_screenshot_btn.png", :alt => "Delete Note"), [current_project, screenshot], :confirm => 'Are you sure?', :method => :delete, :class => "del_btn" %>
+