0&&i.slice(0,c.length).toUpperCase()===c.toUpperCase()?R.val(c+i.slice(c.length)):R.val("")}}else U(),B(a,!0);g&&y(a,!1)},function(){U(),y(a,!1),B(a,!0)})};D&&(angular.element(i).on("resize",n),h.find("body").on("scroll",n));var Y=k(function(){N.matches.length&&o(),N.moveInProgress=!1},s);N.moveInProgress=!1,N.query=void 0;var Z,$=function(a){Z=g(function(){X(a)},u)},_=function(){Z&&g.cancel(Z)};U(),N.assignIsOpen=function(b){H(a,b)},N.select=function(d,e){var f,h,i={};x=!0,i[M.itemName]=h=N.matches[d].model,f=M.modelMapper(a,i),L(a,f),p.$setValidity("editable",!0),p.$setValidity("parse",!0),z(a,{$item:h,$model:f,$label:M.viewMapper(a,i),$event:e}),U(),N.$eval(c.typeaheadFocusOnSelect)!==!1&&g(function(){b[0].focus()},0,!1)},b.on("keydown",function(a){if(0!==N.matches.length&&-1!==r.indexOf(a.which)){if(-1===N.activeIdx&&(9===a.which||13===a.which))return U(),void N.$digest();a.preventDefault();var b;switch(a.which){case 9:case 13:N.$apply(function(){angular.isNumber(N.debounceUpdate)||angular.isObject(N.debounceUpdate)?k(function(){N.select(N.activeIdx,a)},angular.isNumber(N.debounceUpdate)?N.debounceUpdate:N.debounceUpdate["default"]):N.select(N.activeIdx,a)});break;case 27:a.stopPropagation(),U(),N.$digest();break;case 38:N.activeIdx=(N.activeIdx>0?N.activeIdx:N.matches.length)-1,N.$digest(),b=S.find("li")[N.activeIdx],b.parentNode.scrollTop=b.offsetTop;break;case 40:N.activeIdx=(N.activeIdx+1)%N.matches.length,N.$digest(),b=S.find("li")[N.activeIdx],b.parentNode.scrollTop=b.offsetTop}}}),b.bind("focus",function(a){w=!0,0!==t||p.$viewValue||g(function(){X(p.$viewValue,a)},0)}),b.bind("blur",function(a){A&&N.matches.length&&-1!==N.activeIdx&&!x&&(x=!0,N.$apply(function(){angular.isObject(N.debounceUpdate)&&angular.isNumber(N.debounceUpdate.blur)?k(function(){N.select(N.activeIdx,a)},N.debounceUpdate.blur):N.select(N.activeIdx,a)})),!v&&p.$error.editable&&(p.$viewValue="",b.val("")),w=!1,x=!1});var aa=function(a){b[0]!==a.target&&3!==a.which&&0!==N.matches.length&&(U(),j.$$phase||N.$digest())};h.on("click",aa),a.$on("$destroy",function(){h.off("click",aa),(D||E)&&ba.remove(),D&&(angular.element(i).off("resize",n),h.find("body").off("scroll",n)),S.remove(),I&&Q.remove()});var ba=d(S)(N);D?h.find("body").append(ba):E?angular.element(E).eq(0).append(ba):b.after(ba),this.init=function(b,c){p=b,q=c,N.debounceUpdate=p.$options&&e(p.$options.debounce)(a),p.$parsers.unshift(function(b){return w=!0,0===t||b&&b.length>=t?u>0?(_(),$(b)):X(b):(y(a,!1),_(),U()),v?b:b?void p.$setValidity("editable",!1):(p.$setValidity("editable",!0),null)}),p.$formatters.push(function(b){var c,d,e={};return v||p.$setValidity("editable",!0),C?(e.$model=b,C(a,e)):(e[M.itemName]=b,c=M.viewMapper(a,e),e[M.itemName]=void 0,d=M.viewMapper(a,e),c!==d?c:b)})}}]).directive("uibTypeahead",function(){return{controller:"UibTypeaheadController",require:["ngModel","^?ngModelOptions","uibTypeahead"],link:function(a,b,c,d){d[2].init(d[0],d[1])}}}).directive("uibTypeaheadPopup",["$$debounce",function(a){return{scope:{matches:"=",query:"=",active:"=",position:"&",moveInProgress:"=",select:"&",assignIsOpen:"&",debounce:"&"},replace:!0,templateUrl:function(a,b){return b.popupTemplateUrl||"uib/template/typeahead/typeahead-popup.html"},link:function(b,c,d){b.templateUrl=d.templateUrl,b.isOpen=function(){var a=b.matches.length>0;return b.assignIsOpen({isOpen:a}),a},b.isActive=function(a){return b.active===a},b.selectActive=function(a){b.active=a},b.selectMatch=function(c,d){var e=b.debounce();angular.isNumber(e)||angular.isObject(e)?a(function(){b.select({activeIdx:c,evt:d})},angular.isNumber(e)?e:e["default"]):b.select({activeIdx:c,evt:d})}}}}]).directive("uibTypeaheadMatch",["$templateRequest","$compile","$parse",function(a,b,c){return{scope:{index:"=",match:"=",query:"="},link:function(d,e,f){var g=c(f.templateUrl)(d.$parent)||"uib/template/typeahead/typeahead-match.html";a(g).then(function(a){var c=angular.element(a.trim());e.replaceWith(c),b(c)(d)})}}}]).filter("uibTypeaheadHighlight",["$sce","$injector","$log",function(a,b,c){function d(a){return a.replace(/([.?*+^$[\]\\(){}|-])/g,"\\$1")}function e(a){return/<.*>/g.test(a)}var f;return f=b.has("$sanitize"),function(b,g){return!f&&e(b)&&c.warn("Unsafe use of typeahead please use ngSanitize"),b=g?(""+b).replace(new RegExp(d(g),"gi"),"$& "):b,f||(b=a.trustAsHtml(b)),b}}]),angular.module("uib/template/accordion/accordion-group.html",[]).run(["$templateCache",function(a){a.put("uib/template/accordion/accordion-group.html",'\n')}]),angular.module("uib/template/accordion/accordion.html",[]).run(["$templateCache",function(a){a.put("uib/template/accordion/accordion.html",'
')}]),angular.module("uib/template/alert/alert.html",[]).run(["$templateCache",function(a){a.put("uib/template/alert/alert.html",'\n')}]),angular.module("uib/template/carousel/carousel.html",[]).run(["$templateCache",function(a){a.put("uib/template/carousel/carousel.html",'')}]),angular.module("uib/template/carousel/slide.html",[]).run(["$templateCache",function(a){a.put("uib/template/carousel/slide.html",'
\n')}]),angular.module("uib/template/datepicker/datepicker.html",[]).run(["$templateCache",function(a){a.put("uib/template/datepicker/datepicker.html",'\n
')}]),angular.module("uib/template/datepicker/day.html",[]).run(["$templateCache",function(a){a.put("uib/template/datepicker/day.html",'\n \n \n {{title}} \n \n {{::label.abbr}} \n \n \n \n {{ weekNumbers[$index] }} \n {{::dt.label}} \n \n \n
\n');
+}]),angular.module("uib/template/datepicker/month.html",[]).run(["$templateCache",function(a){a.put("uib/template/datepicker/month.html",'\n \n \n {{title}} \n \n \n \n \n {{::dt.label}} \n \n \n
\n')}]),angular.module("uib/template/datepicker/popup.html",[]).run(["$templateCache",function(a){a.put("uib/template/datepicker/popup.html",'\n \n
\n')}]),angular.module("uib/template/datepicker/year.html",[]).run(["$templateCache",function(a){a.put("uib/template/datepicker/year.html",'\n \n \n {{title}} \n \n \n \n \n {{::dt.label}} \n \n \n
\n')}]),angular.module("uib/template/modal/backdrop.html",[]).run(["$templateCache",function(a){a.put("uib/template/modal/backdrop.html",'
\n')}]),angular.module("uib/template/modal/window.html",[]).run(["$templateCache",function(a){a.put("uib/template/modal/window.html",'\n')}]),angular.module("uib/template/pager/pager.html",[]).run(["$templateCache",function(a){a.put("uib/template/pager/pager.html",'\n')}]),angular.module("uib/template/pagination/pagination.html",[]).run(["$templateCache",function(a){a.put("uib/template/pagination/pagination.html",'\n')}]),angular.module("uib/template/tooltip/tooltip-html-popup.html",[]).run(["$templateCache",function(a){a.put("uib/template/tooltip/tooltip-html-popup.html",'\n')}]),angular.module("uib/template/tooltip/tooltip-popup.html",[]).run(["$templateCache",function(a){a.put("uib/template/tooltip/tooltip-popup.html",'\n')}]),angular.module("uib/template/tooltip/tooltip-template-popup.html",[]).run(["$templateCache",function(a){a.put("uib/template/tooltip/tooltip-template-popup.html",'\n')}]),angular.module("uib/template/popover/popover-html.html",[]).run(["$templateCache",function(a){a.put("uib/template/popover/popover-html.html",'\n')}]),angular.module("uib/template/popover/popover-template.html",[]).run(["$templateCache",function(a){a.put("uib/template/popover/popover-template.html",'\n')}]),angular.module("uib/template/popover/popover.html",[]).run(["$templateCache",function(a){a.put("uib/template/popover/popover.html",'\n')}]),angular.module("uib/template/progressbar/bar.html",[]).run(["$templateCache",function(a){a.put("uib/template/progressbar/bar.html",'
\n')}]),angular.module("uib/template/progressbar/progress.html",[]).run(["$templateCache",function(a){a.put("uib/template/progressbar/progress.html",'
')}]),angular.module("uib/template/progressbar/progressbar.html",[]).run(["$templateCache",function(a){a.put("uib/template/progressbar/progressbar.html",'\n')}]),angular.module("uib/template/rating/rating.html",[]).run(["$templateCache",function(a){a.put("uib/template/rating/rating.html",'\n ({{ $index < value ? \'*\' : \' \' }}) \n \n')}]),angular.module("uib/template/tabs/tab.html",[]).run(["$templateCache",function(a){a.put("uib/template/tabs/tab.html",'\n {{heading}} \n \n')}]),angular.module("uib/template/tabs/tabset.html",[]).run(["$templateCache",function(a){a.put("uib/template/tabs/tabset.html",'\n')}]),angular.module("uib/template/timepicker/timepicker.html",[]).run(["$templateCache",function(a){a.put("uib/template/timepicker/timepicker.html",'\n')}]),angular.module("uib/template/typeahead/typeahead-match.html",[]).run(["$templateCache",function(a){a.put("uib/template/typeahead/typeahead-match.html",'
+ <% current_user.albums.limit(6).each_with_index do |album, i| %>
+
ALBUM:<%= i %><%= album.title %>
+
+ <% end %>
+
<%= f.label :title %>
<%= f.label :access %>
- <%= f.submit %>
+ <%= f.button class:"btn btn-success" %>
<% end %>
diff --git a/app/views/albums/_image_page.html.erb b/app/views/albums/_image_page.html.erb
index 5dc2ac7..e69de29 100644
--- a/app/views/albums/_image_page.html.erb
+++ b/app/views/albums/_image_page.html.erb
@@ -1,112 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
5.1
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
Editing Album
<%= render 'form' %>
-
-<%= link_to 'Show', @album %> |
-<%= link_to 'Back', album_index_page_path(@album) %>
+<%= link_to 'Show', album_show_page_path(username: @album.user.username, title: @album.title) %> |
+<%= link_to 'Back', album_index_page_path(username: @album.user.username) %>
diff --git a/app/views/albums/index.html.erb b/app/views/albums/index.html.erb
index 31e7b1f..f91e471 100644
--- a/app/views/albums/index.html.erb
+++ b/app/views/albums/index.html.erb
@@ -1,20 +1,33 @@
-
- <%= link_to 'Create New Album', album_new_page_path(@album, username: current_user.username) %>
-
-
+<% if @user.username == current_user.username %>
+
+ <%= link_to 'Create New Album', album_new_page_path(@album, username: current_user.username) %>
+
+<% end %>
-
+
+
+
<% @albums.each do |album| %>
+
<% end %>
\ No newline at end of file
diff --git a/app/views/albums/new.html.erb b/app/views/albums/new.html.erb
index e28d078..92aa37d 100644
--- a/app/views/albums/new.html.erb
+++ b/app/views/albums/new.html.erb
@@ -2,4 +2,4 @@
<%= render 'form' %>
-<%= link_to 'Back', album_index_page_path(@album, username: current_user.username) %>
+<%= link_to 'Back', album_index_page_path(@album, username: current_user.username), class:"btn btn-default" %>
\ No newline at end of file
diff --git a/app/views/albums/show.html.erb b/app/views/albums/show.html.erb
index d7fa396..3b0e015 100644
--- a/app/views/albums/show.html.erb
+++ b/app/views/albums/show.html.erb
@@ -1,5 +1,5 @@
-
<%= @album.title %>
+
<%= @user.username %>'s <%= @album.title %>
@@ -60,7 +60,7 @@
- <% end %>
+ <% end %>
»
+
+ <% if @user.username == current_user.username %>
<%= link_to 'Edit Album', edit_album_path(@album), class:"btn btn-default" %>
- <%= link_to 'Delete Album', @album, method: :delete, data: { confirm: 'Are you sure?' }, class:"btn btn-warning" %>
+ <%= button_to 'Delete Album', @album, method: :delete, data: { confirm: 'Are you sure?' }, class:"btn btn-warning" %>
+
+ <% end %>
- <%= link_to 'Back', album_index_page_path(username: current_user.username), class:"btn btn-default" %>
+ <%= link_to 'Back', album_index_page_path(username: current_user.username), class:"btn btn-default" %>
\ No newline at end of file
+ var options = {
+ currentPage: 3,
+ totalPages: 10
+ };
+
+ $('.pager').bootstrapPaginator(options);
+
+
diff --git a/app/views/comments/_form.html.erb b/app/views/comments/_form.html.erb
new file mode 100644
index 0000000..e6a9c7b
--- /dev/null
+++ b/app/views/comments/_form.html.erb
@@ -0,0 +1,24 @@
+<%= form_for([@image, @comment]) do |f| %>
+ <% if @comment.errors.any? %>
+
+
<%= pluralize(@comment.errors.count, 'error') %> prohibited this comment from being saved:
+
+
+ <% @comment.errors.full_messages.each do |message| %>
+ <%= message %>
+ <% end %>
+
+
+ <%= f.label :body %>
+
+ <%= f.submit %>
+
+<% end %>
diff --git a/app/views/comments/edit.html.erb b/app/views/comments/edit.html.erb
new file mode 100644
index 0000000..479871e
--- /dev/null
+++ b/app/views/comments/edit.html.erb
@@ -0,0 +1,5 @@
+Editing Comment
+
+<%= render 'form' %>
+
+<%= link_to 'Back to image', image_path(@comment.image) %>
\ No newline at end of file
diff --git a/app/views/comments/index.html.erb b/app/views/comments/index.html.erb
new file mode 100644
index 0000000..6cc1aee
--- /dev/null
+++ b/app/views/comments/index.html.erb
@@ -0,0 +1,31 @@
+<%= notice %>
+
+Listing Comments
+
+
+
+
+ Image
+ User
+ Body
+
+
+
+
+ <% @comments.each do |comment| %>
+
+ <%= comment.image %>
+ <%= comment.user %>
+ <%= comment.body %>
+ <%= link_to 'Show', comment %>
+ <%= link_to 'Edit', edit_comment_path(comment) %>
+ <%= link_to 'Destroy', comment, method: :delete, data: { confirm: 'Are you sure?' } %>
+
+ <% end %>
+
+
+
+New Comment
+
+<%= render 'form' %>
+
+<%= link_to 'Back', comments_path %>
\ No newline at end of file
diff --git a/app/views/comments/show.html.erb b/app/views/comments/show.html.erb
new file mode 100644
index 0000000..b3b927b
--- /dev/null
+++ b/app/views/comments/show.html.erb
@@ -0,0 +1,19 @@
+<%= notice %>
+
+
+ Image:
+ <%= @comment.image %>
+
+
+
+ User:
+ <%= @comment.user %>
+
+
+
+ Body:
+ <%= @comment.body %>
+
+
+<%= link_to 'Edit', edit_comment_path(@comment) %> |
+<%= link_to 'Back', comments_path %>
\ No newline at end of file
diff --git a/app/views/comments/show.json.jbuilder b/app/views/comments/show.json.jbuilder
new file mode 100644
index 0000000..9d8029a
--- /dev/null
+++ b/app/views/comments/show.json.jbuilder
@@ -0,0 +1 @@
+json.extract! @comment, :id, :image_id, :user_id, :body, :created_at, :updated_at
diff --git a/app/views/conversations/show.html.erb b/app/views/conversations/show.html.erb
index f085787..a9f17d2 100644
--- a/app/views/conversations/show.html.erb
+++ b/app/views/conversations/show.html.erb
@@ -22,4 +22,4 @@
<% end %>
-<%= subscribe_to conversation_path(@conversation) %>
+<%= subscribe_to conversation_path(@conversation) %>
\ No newline at end of file
diff --git a/app/views/images/_form.html.erb b/app/views/images/_form.html.erb
index 8b88842..f8e9bf5 100644
--- a/app/views/images/_form.html.erb
+++ b/app/views/images/_form.html.erb
@@ -1,3 +1,6 @@
+<%= tinymce_assets %>
+<%= tinymce %>
+
<%= form_for(@image, html: { multipart: true }) do |f| %>
<% if @image.errors.any? %>
@@ -34,7 +37,7 @@
<%= f.label :description %>
<%= f.submit %>
diff --git a/app/views/images/_grid_cell.html.erb b/app/views/images/_grid_cell.html.erb
index 530a389..dcc3a3b 100644
--- a/app/views/images/_grid_cell.html.erb
+++ b/app/views/images/_grid_cell.html.erb
@@ -1,5 +1,6 @@
-
+
+
<%= link_to image_path(image) do %>
- <%= image_tag image.attachment.url(:thumb), alt: image.title %>
+ <%= image_tag image.attachment.url(:thumb), alt: image.title, draggable: false %>
<% end %>
-
\ No newline at end of file
+
diff --git a/app/views/images/edit.html.erb b/app/views/images/edit.html.erb
index 7e89703..ce0f0e6 100644
--- a/app/views/images/edit.html.erb
+++ b/app/views/images/edit.html.erb
@@ -2,5 +2,4 @@
<%= render 'form' %>
-<%= link_to 'Show', @image %> |
-<%= link_to 'Back', images_path %>
+<%= link_to 'Show', @image %>
diff --git a/app/views/images/index.html.erb b/app/views/images/index.html.erb
index 2131f12..b1e4ec8 100644
--- a/app/views/images/index.html.erb
+++ b/app/views/images/index.html.erb
@@ -1,16 +1,19 @@
-
<%= notice %>
Listing Images
+
- <% @images.each do |image| %>
- <%= render partial: 'images/grid_cell', locals: {image: image} %>
- <% end %>
+
+ <% @images.each do |image| %>
+ <%= render partial: 'images/grid_cell', locals: {image: image} %>
+ <% end %>
+
-<%= paginate @images %>
-<%= link_to 'New Image', new_image_path %>
+
+<%= paginate @images %>
+<%= link_to 'New Image', new_image_path %>
\ No newline at end of file
diff --git a/app/views/images/new.html.erb b/app/views/images/new.html.erb
index 94192a2..4f95281 100644
--- a/app/views/images/new.html.erb
+++ b/app/views/images/new.html.erb
@@ -2,4 +2,4 @@
<%= render 'form' %>
-<%= link_to 'Back', images_path %>
+<%= link_to 'Back', images_path %>
\ No newline at end of file
diff --git a/app/views/images/show.html.erb b/app/views/images/show.html.erb
index 5d22345..adf2510 100644
--- a/app/views/images/show.html.erb
+++ b/app/views/images/show.html.erb
@@ -1,4 +1,29 @@
-
<%= notice %>
+<% content_for :head do %>
+ <%= tag 'meta', name: 'description', content: @image.description[0..155] %>
+
+
+ <%= tag 'meta', property: 'og:title', content: @image.title %>
+ <%= tag 'meta', property: 'og:author', content: @image.user.username %>
+ <%= tag 'meta', property: 'og:type', content: 'article' %>
+ <%= tag 'meta', property: 'og:url', content: image_url(@image) %>
+ <%= tag 'meta', property: 'og:image', content: URI.join(request.url, @image.attachment.url) %>
+ <%= tag 'meta', property: 'og:description', content: @image.description %>
+ <%= tag 'meta', property: 'og:site_name', content: 'Sqribbler' %>
+ <%= tag 'meta', property: 'og:image:width', content: @image.image_width %>
+ <%= tag 'meta', property: 'og:image:height', content: @image.image_height %>
+
+
+ <%= tag 'meta', itemprop: 'name', content: @image.title %>
+ <%= tag 'meta', itemprop: 'description', content: @image.description %>
+ <%= tag 'meta', itemprop: 'image', content: URI.join(request.url, @image.attachment.url) %>
+
+
+ <%= tag 'meta', name: 'twitter:card', content: 'summary_large_image' %>
+ <%= tag 'meta', name: 'twitter:title', content: @image.title %>
+ <%= tag 'meta', name: 'twitter:description', content: @image.description[0..200] %>
+ <%= tag 'meta', name: 'twitter:image:src', content: URI.join(request.url, @image.attachment.url) %>
+
+<% end %>
<%= @image.title %>
@@ -6,6 +31,16 @@
<%= image_tag @image.attachment.url(:original), id: 'main_image' %>
+<% if current_user %>
+ <%= render partial: 'user/vote', locals: {item: @image} %>
+<% end %>
+
+<% if !current_user.nil? && current_user.id == @image.user_id %>
+ <%= link_to 'Edit', edit_image_path(@image) %>
+<% end %>
+
+
+
<%= render partial: 'user/entry', locals: {user: @image.user} %>
@@ -17,10 +52,41 @@ Albums:
<% end %>
+<% unless @image.description.nil? %>
- Description:
- <%= @image.description %>
+ Description:
+<% end %>
+
+<% unless current_user.nil? %>
+ <%= render 'comments/form' %>
+<% end %>
+
+ <% @image.comments.each do |comment| %>
+
+
+
+ <% end %>
+
-<%= link_to 'Edit', edit_image_path(@image) %> |
-<%= link_to 'Back', images_path %>
+<%#= link_to 'Back', images_path %>
\ No newline at end of file
diff --git a/app/views/images/show.json.jbuilder b/app/views/images/show.json.jbuilder
index 989e890..927f502 100644
--- a/app/views/images/show.json.jbuilder
+++ b/app/views/images/show.json.jbuilder
@@ -1 +1,3 @@
-json.extract! @image, :id, :user_id, :title, :description, :created_at, :updated_at
+json.extract! @image, :id, :user_id, :title, :description, :created_at, :updated_at, :image_width, :image_height
+json.content_type @image.attachment_content_type
+json.file_size @image.attachment_file_size
\ No newline at end of file
diff --git a/app/views/landing_page/index.html.erb b/app/views/landing_page/index.html.erb
index 813ef84..8f907bd 100644
--- a/app/views/landing_page/index.html.erb
+++ b/app/views/landing_page/index.html.erb
@@ -31,6 +31,10 @@
<%= render partial: 'layouts/search' %>
+
+
-
+
Top Scribbles
<%= render partial: 'layouts/bootstrap_carousel' %>
@@ -145,25 +149,19 @@
- <%= render partial: 'layouts/swipe_menu' %>
<% end %>
\ No newline at end of file
diff --git a/app/views/layouts/_friends_box.html.erb b/app/views/layouts/_friends_box.html.erb
index 09fe786..be981d1 100644
--- a/app/views/layouts/_friends_box.html.erb
+++ b/app/views/layouts/_friends_box.html.erb
@@ -8,17 +8,17 @@
- <%= link_to 'Create New Album' , new_album_path(@album) %>
+ <%= link_to 'Create New Album', album_new_page_path(@album, username: current_user.username) %>
<% else %>
-
-
- <%= link_to "Albums: #{current_user.albums.count}",album_index_page_path(username: current_user.username) %>
-
-
+
+
+ <%= link_to "Albums: #{@user.accessible_albums(current_user).count}",album_index_page_path(username: @user.username) %>
+
+
<%= notice %> <%= alert %>
-
diff --git a/app/views/layouts/_mini_conversation.html.erb b/app/views/layouts/_mini_conversation.html.erb
new file mode 100644
index 0000000..70b4add
--- /dev/null
+++ b/app/views/layouts/_mini_conversation.html.erb
@@ -0,0 +1,31 @@
+
+
+
+
+
<%= link_to 'Message', message_friend_path(current_user.username) %>
+
+
+ <% if @conversations != nil %>
+
+ <% else %>
+
You have no conversations. Click message to create one.
+ <% end %>
+
+
+
+
+
<%= link_to 'Register', new_user_registration_path %>
<%= link_to 'Login', new_user_session_path %>
<% else %>
- <%= link_to 'Upload', new_image_path %>
- <%= link_to current_user.username, user_profile_path(current_user.username) %>
- <%= link_to 'Sign out', destroy_user_session_path, method: :delete %>
+ <%= link_to 'Upload', new_image_path %>
+ <%= link_to current_user.username, user_profile_path(current_user.username) %>
+ <%= link_to 'Sign out', destroy_user_session_path, method: :delete %>
<% end %>
diff --git a/app/views/layouts/_swipe_menu.html.erb b/app/views/layouts/_swipe_menu.html.erb
index 2723dd7..9c0477e 100644
--- a/app/views/layouts/_swipe_menu.html.erb
+++ b/app/views/layouts/_swipe_menu.html.erb
@@ -7,24 +7,23 @@
+ <%= render partial: 'user/search' %><%= link_to 'HOME PAGE', root_path %>
<%= link_to 'USER PROFILE', user_profile_path(current_user.username) %>
- <%= link_to 'FIND AN IMAGE', user_profile_path(current_user.username) %>
+ <%= link_to 'FIND AN IMAGE', root_path %>
<%= link_to 'CONTACT A FRIEND', user_profile_path(current_user.username) %>
- <%= link_to 'CONTACT SQRIBBLER', user_profile_path(current_user.username) %>
- <%= render partial: 'layouts/swipe_search' %>
- <% unless params[:search].blank? %>
- <% @search.each do |user| %>
- <%= link_to user.username, user_profile_path(user.username) %>
- <% end %>
+ <%= link_to 'CONTACT SQRIBBLER', layouts_contact_page_path %>
+
- <% end %>
-
-
+
+
-
+
+
+
\ No newline at end of file
diff --git a/app/views/layouts/_swipe_search.html.erb b/app/views/layouts/_swipe_search.html.erb
index 4a12a96..cea140e 100644
--- a/app/views/layouts/_swipe_search.html.erb
+++ b/app/views/layouts/_swipe_search.html.erb
@@ -1,10 +1,11 @@
-
- <%= form_tag '', method: 'get', class: 'navbar-search', role: 'search' do %>
+
+ <%= form_tag landing_page_index_path, method: 'get', class: 'navbar-search', role: 'search' do %>
<%= search_field_tag :search, params[:search], size: 150, placeholder: "FIND A FRIEND.", class: "form-control" %>
- <%= submit_tag 'Search', class: "btn btn-default" do %>
-
- <% end %>
+
+ <%= submit_tag 'Search', class: "btn btn-default" do %>
+
+ <% end %>
<% end %>
\ No newline at end of file
diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb
old mode 100755
new mode 100644
index 153d7f5..c462703
--- a/app/views/layouts/application.html.erb
+++ b/app/views/layouts/application.html.erb
@@ -9,27 +9,31 @@
-
- <%= stylesheet_link_tag 'application', media: 'all', '../javascripts/jquery-ui-1.11.4.custom/jquery-ui.min.css' => true %>
- <%= stylesheet_link_tag 'application', 'http://www.shieldui.com/shared/components/latest/css/light-bootstrap/all.min.css' => true %>
- <%= stylesheet_link_tag 'application', media: 'all', 'data-turbolinks-track' => true %>
+
+ <%= stylesheet_link_tag 'http://www.shieldui.com/shared/components/latest/css/light-bootstrap/all.min.css' %>
+ <%= javascript_include_tag '/assets/jquery-2.2.0.min.js' %>
+ <%= stylesheet_link_tag 'application', media: 'all' %>
<%= javascript_include_tag 'application' %>
-
- <%= javascript_include_tag 'javascripts/jquery-ui1.11.4.custom/jquery/jquery.js' => true %>
- <%= javascript_include_tag '../javascripts/jquery-ui-1.11.4.custom/jquery-ui.min.js' => true %>
- <%= javascript_include_tag 'http://www.shieldui.com/shared/components/latest/js/shieldui-all.min.js' => true %>
+ <%= javascript_include_tag 'javascripts/jquery-ui1.11.4.custom/jquery/jquery.js' => true %>
+ <%= javascript_include_tag '../javascripts/jquery-ui-1.11.4.custom/jquery-ui.min.js' => true %>
+ <%= javascript_include_tag 'http://www.shieldui.com/shared/components/latest/js/shieldui-all.min.js' => true %>
<%= csrf_meta_tags %>
+
+ <% if content_for?(:head) %>
+ <%= yield :head %>
+ <% end %>
+
 %>)
- <% end %>
+ <% end %>
-
-
-
- 
+ 
+ <% else %>
+