From 1b44175c31b8c317f6f837cca487c5d707762752 Mon Sep 17 00:00:00 2001
From: Connor Turland <connor@madhattertech.ca>
Date: Mon, 7 Jan 2013 23:03:41 -0500
Subject: [PATCH] added home page with recent info, and personal profiles with
 recent indo

---
 app/assets/images/synapse.png            | Bin 0 -> 6953 bytes
 app/assets/images/synapse2.png           | Bin 0 -> 8504 bytes
 app/assets/javascripts/Jit/analyze.js    |  91 +++++++++++++----------
 app/assets/stylesheets/application.css   |  21 +++++-
 app/assets/stylesheets/maps.css.scss     |   5 ++
 app/assets/stylesheets/synapses.css.scss |  69 ++++++++++++++++-
 app/controllers/main_controller.rb       |   8 ++
 app/controllers/users_controller.rb      |   6 +-
 app/views/main/_analyze.html.erb         |   2 +
 app/views/main/home.html.erb             |  31 ++++++++
 app/views/synapses/_synapse.html.erb     |  11 +++
 app/views/users/show.html.erb            |  22 +++++-
 config/routes.rb                         |   2 +-
 13 files changed, 215 insertions(+), 53 deletions(-)
 create mode 100644 app/assets/images/synapse.png
 create mode 100644 app/assets/images/synapse2.png
 create mode 100644 app/views/main/home.html.erb
 create mode 100644 app/views/synapses/_synapse.html.erb

diff --git a/app/assets/images/synapse.png b/app/assets/images/synapse.png
new file mode 100644
index 0000000000000000000000000000000000000000..8ae3ca7b35cd1cdf58d6e9e9cb80c7f942f1f34e
GIT binary patch
literal 6953
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
Cmm2E;

literal 0
HcmV?d00001

diff --git a/app/assets/images/synapse2.png b/app/assets/images/synapse2.png
new file mode 100644
index 0000000000000000000000000000000000000000..0adecbacd40f54080955834426650cfbc78d4572
GIT binary patch
literal 8504
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

literal 0
HcmV?d00001

diff --git a/app/assets/javascripts/Jit/analyze.js b/app/assets/javascripts/Jit/analyze.js
index 41a69c7f..735ae7b2 100644
--- a/app/assets/javascripts/Jit/analyze.js
+++ b/app/assets/javascripts/Jit/analyze.js
@@ -1,42 +1,51 @@
-////
-////
-////
-//// Define all the dynamic interactions for the Analyze using Jquery
-
-$(document).ready(function() {
-   
-   // this sets up the initial opening of the organize box
-   $('#sideOptionAnalyze').bind('click',function(){
-	   if (!analyzeOpen) openAnalyze();  
-   });
-   
-   // this sets up the closing of the organize box, and the toggling between open and closed.
-   $('#closeAnalyze').bind('click',function(){
-	   if (analyzeOpen) closeAnalyze();
-   });
-});
-
-function openAnalyze() {
-  analyzeOpen = true;
-  if (findOpen) closeFind();
-  if (organizeOpen) closeOrganize();
-  $('#sideOptionFind').css('z-index','8');
-  $('#sideOptionAnalyze, #closeAnalyze').css('z-index','10');
-  $('#sideOptionOrganize').css('z-index','8');
-  $('#sideOptionAnalyze').animate({
-    width: '100px',
-    height: '76px'
-    }, 100);
-  $('#closeAnalyze').css('display','block');
-  $('#sideOptionAnalyze').css('cursor','default');
-}
-
-function closeAnalyze() {
-   analyzeOpen = false;
-   $('#closeAnalyze').css('display','none');
-   $('#sideOptionAnalyze').css('cursor','pointer');
-   $('#sideOptionAnalyze').animate({
-     width: '64px',
-     height: '32px'
-     }, 100);
+////
+////
+////
+//// Define all the dynamic interactions for the Analyze using Jquery
+
+$(document).ready(function() {
+   
+   // this sets up the initial opening of the organize box
+   $('#sideOptionAnalyze').bind('click',function(){
+	   if (!analyzeOpen) openAnalyze();  
+   });
+   
+   // this sets up the closing of the organize box, and the toggling between open and closed.
+   $('#closeAnalyze').bind('click',function(){
+	   if (analyzeOpen) closeAnalyze();
+   });
+});
+
+function openAnalyze() {
+  analyzeOpen = true;
+  if (findOpen) closeFind();
+  if (organizeOpen) closeOrganize();
+  $('#sideOptionFind').css('z-index','8');
+  $('#sideOptionAnalyze, #closeAnalyze').css('z-index','10');
+  $('#sideOptionOrganize').css('z-index','8');
+  $('#sideOptionAnalyze').animate({
+    width: '100px',
+    height: '76px'
+    }, 100);
+  $('#closeAnalyze').css('display','block');
+  $('#sideOptionAnalyze').css('cursor','default');
+  var numT = Object.keys(Mconsole.graph.nodes).length;
+  var numS = 0;
+  Mconsole.graph.eachNode(function (n) {
+		n.eachAdjacency(function () {
+		  numS++;
+		});
+  });
+  numS = numS/2;
+  $('.analysis').html('<p>' + numT + ' topics</p><p>' + numS + ' synapses</p>');
+}
+
+function closeAnalyze() {
+   analyzeOpen = false;
+   $('#closeAnalyze').css('display','none');
+   $('#sideOptionAnalyze').css('cursor','pointer');
+   $('#sideOptionAnalyze').animate({
+     width: '64px',
+     height: '32px'
+     }, 100);
 }
\ No newline at end of file
diff --git a/app/assets/stylesheets/application.css b/app/assets/stylesheets/application.css
index ab5c6808..28109315 100644
--- a/app/assets/stylesheets/application.css
+++ b/app/assets/stylesheets/application.css
@@ -65,8 +65,9 @@ h2 {
   display:block;
   text-align:center;
   font-family: "vinyl",sans-serif;
-  background: #333;
+  background: url('black_bg.png');
   font-size:24px;
+  line-height:35px;
 }
 
 a {
@@ -82,6 +83,11 @@ a {
   clear:both;
 }
 
+.spacer {
+  display:block;
+  height:50px;	
+}
+
 .hidden {
   display: none;
 }
@@ -89,6 +95,18 @@ a {
 /*
  * Layout stuffs
  */
+ 
+.profile {
+  overflow-y:scroll;
+  height:100%;
+  margin-bottom:50px;	 
+}
+
+.centeredProfile {
+  margin:0 auto;
+  display: block;
+  width: 845px;	
+}
 
 .new_session, 
 .new_user,
@@ -387,7 +405,6 @@ input[type="submit"] {
 #sideOptionAnalyze {
   top:35%;
   width:64px;
-  display:none;
 }
 
 #sideOptionOrganize {
diff --git a/app/assets/stylesheets/maps.css.scss b/app/assets/stylesheets/maps.css.scss
index e829b8ae..12eda20b 100644
--- a/app/assets/stylesheets/maps.css.scss
+++ b/app/assets/stylesheets/maps.css.scss
@@ -2,6 +2,11 @@
 // They will automatically be included in application.css.
 // You can use Sass (SCSS) here: http://sass-lang.com/
 
+.mapdata {
+  color: #1A1;
+  font-style: italic;
+}
+
 .saveMapLayout { 
   float:left;
 }
diff --git a/app/assets/stylesheets/synapses.css.scss b/app/assets/stylesheets/synapses.css.scss
index 73162259..1b69c220 100644
--- a/app/assets/stylesheets/synapses.css.scss
+++ b/app/assets/stylesheets/synapses.css.scss
@@ -1,3 +1,66 @@
-// Place all the styles related to the synapses controller here.
-// They will automatically be included in application.css.
-// You can use Sass (SCSS) here: http://sass-lang.com/
+// Place all the styles related to the synapses controller here.
+// They will automatically be included in application.css.
+// You can use Sass (SCSS) here: http://sass-lang.com/
+
+
+.synapse {
+  display:block;
+  position:relative;
+  width:215px;
+  height:320px;
+  float:left;
+  margin: 30px 0 30px 50px;
+}
+
+.synapseTopic1 {
+  position:absolute;
+  top:0;
+}
+
+.topic1desc {
+display: block;
+width: 190px;
+background: url("bg.png") repeat;
+position: relative;
+margin-left: 25px;
+border-radius: 15px;
+padding: 10px 5px 10px 28px;
+color: #000;
+}
+
+.synapseTopic1 img {
+  position:absolute;
+  top: 15px;
+  z-index: 30;
+}
+
+.synapseDesc {
+  position:absolute;
+  top:22px;
+  left:8px;
+  height:30px;
+  padding:125px 0 125px 35px;
+  background: url('synapse2.png') no-repeat 0 0;
+}
+
+.synapseTopic2 {
+  position:absolute;
+  bottom:0;
+}
+
+.synapseTopic2 img {
+  position:absolute;
+  top:-24px;
+  z-index:30;
+}
+
+.topic2desc {
+display: block;
+width: 190px;
+background: url("bg.png") repeat;
+position: relative;
+margin-left: 25px;
+border-radius: 15px;
+padding: 10px 5px 10px 28px;
+color: #000;
+}
\ No newline at end of file
diff --git a/app/controllers/main_controller.rb b/app/controllers/main_controller.rb
index 8f08a931..d6fc3079 100644
--- a/app/controllers/main_controller.rb
+++ b/app/controllers/main_controller.rb
@@ -5,6 +5,14 @@ class MainController < ApplicationController
    
   respond_to :html, :js, :json
   
+  def home
+    @topics = Topic.order("created_at DESC").limit(3).visibleToUser(@current, nil)
+    @synapses = Synapse.order("created_at DESC").limit(3).visibleToUser(@current, nil)
+    @maps = Map.order("created_at DESC").limit(3).visibleToUser(@current, nil)
+    
+    respond_with(@topics, @synapses, @maps) 
+  end
+  
   def console	
 	
   end
diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb
index 73a15553..f603cb31 100644
--- a/app/controllers/users_controller.rb
+++ b/app/controllers/users_controller.rb
@@ -24,9 +24,9 @@ class UsersController < ApplicationController
   # GET /user
   def show
     @user = User.find(params[:id])
-    @topics = @user.topics.order("created_at").limit(3)
-    @synapses = @user.synapses.order("created_at").limit(3)
-    @maps = @user.maps.order("created_at").limit(3)
+    @topics = @user.topics.order("created_at DESC").limit(3)
+    @synapses = @user.synapses.order("created_at DESC").limit(3)
+    @maps = @user.maps.order("created_at DESC").limit(3)
     
     respond_with(@user, @topics, @synapses, @maps) 
   end
diff --git a/app/views/main/_analyze.html.erb b/app/views/main/_analyze.html.erb
index c9bc412c..c4f92841 100644
--- a/app/views/main/_analyze.html.erb
+++ b/app/views/main/_analyze.html.erb
@@ -1,4 +1,6 @@
 <span id="closeAnalyze" class="closeSideOption">close</span>
 <div class="sideOption" id="sideOptionAnalyze">
   <span class="find_key">Analyze...</span>
+  <div class="clearfloat"></div>
+  <div class="analysis"></div>
 </div>
\ No newline at end of file
diff --git a/app/views/main/home.html.erb b/app/views/main/home.html.erb
new file mode 100644
index 00000000..eaacfa60
--- /dev/null
+++ b/app/views/main/home.html.erb
@@ -0,0 +1,31 @@
+<div class="profile">
+
+<h2>Recently Created Topics <%= link_to "see all", topics_url%></h2>
+<div class="centeredProfile">
+<% @topics.each do |topic| %>
+    <%= render topic %>
+<% end %>
+</div>
+<div class="clearfloat"></div>
+
+<h2>Recently Created Synapses <%= link_to "see all", synapses_url%></h2>
+<div class="centeredProfile">
+<% @synapses.each do |synapse| %>
+    <%= render synapse %>
+<% end %>
+</div>
+<div class="clearfloat"></div>
+
+<h2>Recently Created Maps <%= link_to "see all", maps_url%></h2>
+<div class="centeredProfile">
+<% @maps.each do |map| %>
+    <%= render map %>
+<% end %>
+</div>
+<div class="clearfloat spacer"></div>
+
+</div>
+
+<h1 class="index">
+  Home
+</h1>
\ No newline at end of file
diff --git a/app/views/synapses/_synapse.html.erb b/app/views/synapses/_synapse.html.erb
new file mode 100644
index 00000000..b5635949
--- /dev/null
+++ b/app/views/synapses/_synapse.html.erb
@@ -0,0 +1,11 @@
+<%= div_for synapse do %>
+  <div class="synapseTopic1">  
+    <p class="topic1desc"><%= link_to synapse.topic1.name, topic_url(synapse.topic1) %></p>
+    <%= image_tag synapse.topic1.metacode.icon, :class => 'icon', :size => '50x50' %> 
+  </div>
+  <div class="synapseDesc"><%= synapse.desc %></div>
+  <div class="synapseTopic2">  
+    <%= image_tag synapse.topic2.metacode.icon, :class => 'icon', :size => '50x50' %>
+    <p class="topic2desc"><%= link_to synapse.topic2.name, topic_url(synapse.topic2) %></p>
+  </div>
+<% end %>
\ No newline at end of file
diff --git a/app/views/users/show.html.erb b/app/views/users/show.html.erb
index 8b37c0be..4e18c98b 100644
--- a/app/views/users/show.html.erb
+++ b/app/views/users/show.html.erb
@@ -17,17 +17,33 @@
 </div>
 <div class="clearfloat nodemargin"></div>-->
 
-<h2>Recently Created Topics</h2>
+<div class="profile">
+
+<h2>Recently Created Topics <%= link_to "see all", user_topics_path(@user)%></h2>
+<div class="centeredProfile">
 <% @topics.each do |topic| %>
     <%= render topic %>
 <% end %>
+</div>
 <div class="clearfloat"></div>
 
-<h2>Recently Created Maps</h2>
+<h2>Recently Created Synapses <%= link_to "see all", user_synapses_path(@user)%></h2>
+<div class="centeredProfile">
+<% @synapses.each do |synapse| %>
+    <%= render synapse %>
+<% end %>
+</div>
+<div class="clearfloat"></div>
+
+<h2>Recently Created Maps <%= link_to "see all", user_maps_path(@user)%></h2>
+<div class="centeredProfile">
 <% @maps.each do |map| %>
     <%= render map %>
 <% end %>
-<div class="clearfloat"></div>
+</div>
+<div class="clearfloat spacer"></div>
+
+</div>
 
 <h1 class="index">
   Viewing Mapper: <%= @user.name %>
diff --git a/config/routes.rb b/config/routes.rb
index 69255032..173c127c 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -1,6 +1,6 @@
 ISSAD::Application.routes.draw do
 
-  root to: 'main#console', via: :get
+  root to: 'main#home', via: :get
   
   match 'console', to: 'main#console', via: :get, as: :console