Commits

Aaron Zinman  committed 5385543 Draft

fixed up various odds and ends

  • Participants
  • Parent commits 7460bc1

Comments (0)

Files changed (5)

File backend/src/main/scala/edu/mit/media/defuse/libdefuse/webcore/JettyLauncher.scala

     val context = new WebAppContext()
     context.setDefaultsDescriptor("webdefault.xml")
     context.setDescriptor(webAppDir + "/WEB-INF/web.xml")
-    resourcesDir = None // TODO Fix this -- specifying is somehow breaking the /api servlet
+    //resourcesDir = None // TODO Fix this -- specifying is somehow breaking the /api servlet
     val webDir = resourcesDir match {
       case Some(dir:String) => dir
       case None => Thread.currentThread.getContextClassLoader.getResource(webAppDir).toExternalForm

File frontend/css/site.css

 }
 
 #liveConstruction {
+  display: none;
   position:fixed;
   z-index:4999;
   background-image: url(../images/top-stripe.png);
 
 /* ///////////////////// INTRO ///////////////////////////////////////////////////////////////// */
 
+/*
 #topArticlesHolderEvBlock {
   position: absolute;
   left: 0;
   -moz-transition: all 0.2s ease-in;
   -webkit-transition: all 0.2s ease-in;
 }
-
+*/
 #topArticlesHolder {
   position: absolute;
   left: 0;
   top: 20px;
-  width: 479px;
-  overflow: hidden;
+  width: 100%; /* 479px; */
+  /* overflow: hidden; */
   z-index: 5;
   background-color: #333;
   -moz-transition: all 0.2s ease-in;
   position: relative;
   top: 0;
   left: 0;
-  opacity: 0.2;
-  margin-top:-100px;
+  /*opacity: 0.2;*/
+  /*margin-top:-100px;*/
   -moz-transition: all 0.2s ease-in;
   -webkit-transition: all 0.2s ease-in;
 }
 
 #homeChoices {
   position: relative;
-  overflow: hidden;
+  /*overflow: hidden;*/
   width: 960px;
-  height: 300px;
+  height: 150px;
 }
 
-#homeHeader { margin: 60px 0;}
+#homeHeader { margin-top: 40px;}
+
+#headerfooter {
+  margin-bottom: 10px;
+}
 
 /* ///////////////////// TOP N ARTICLES CHOOSER ///////////////////////////////////////////////////////////////// */
 
 .articleChooser > .selectedArticle,
 .articleChooser > .selectedArticle:active,
 .articleChooser > .selectedArticle:hover {
-  margin-top: 67px;
+/*  margin-top: 67px;
   margin-bottom: 49px;
-  cursor:default;
+*/  cursor:default;
   background-color: #333;
 }
 

File frontend/index-dev.html

 <div id="header_liner" style="display: none;">
   <div id="header" class="container_12">
     <div id="logo">
-      <div id="logoFont">Defuse <span id="logoSubtext">research preview</span></div>
+      <div id="logoFont">Defuse <span id="logoSubtext">research demo</span></div>
     </div>
   </div>
   <div class="clear"></div>
+  <div id="headerfooter" class="container_12">
+    <div>
+      By <a href="http://web.media.mit.edu/~azinman">Aaron Zinman</a><br/>
+      Supervising {<a href="http://web.media.mit.edu/~judith">Judith Donath@mit</a>,
+         <a href="http://web.media.mit.edu/~maes">Pattie Maes@mit</a>,
+         <a href="http://middleangle.com/rif/derifatives/Home/">Ryan Rifkin@google</a>}<br>
+      Defuse is one of the main works in <a href="http://azinman.com/pdfs/aaron_zinman_phd_disstertation.pdf">Aaron's PhD thesis</a>.
+    </div>
+    <div class="clear">
+  </div>
 </div>
 
 
 <div class="clear"></div>
 <div id="root"></div>
 
+<!--
 <div id="footer" class="container_12"  style="display: none;">
   <div style="margin: 1em 0px" class="footerLi"><a href="http://web.media.mit.edu/~azinman">Aaron Zinman</a>
     + {<a href="http://web.media.mit.edu/~judith">Judith Donath</a>,
   </div>
   <div class="clear"></div>
 </div>
+-->
 
 <script type="text/html" id="logoTemplate">
 <div>
     <div class="invertedBlue">Defuse is a new way to see the people behind them.</div>
     <div class="reset clear"></div>
   </div>
+
+  <!--
   <div id="homeChoicesTitle">
     <ul>
       <li id="homeForest" class="homeTitleChoice">ARTICLE VIEW</center></li>
     </ul>
     <div class="reset clear"></div>
   </div>
+  -->
   <div id="homeChoices">
-    <div id="topArticlesHolderEvBlock"></div>
+    <!-- <div id="topArticlesHolderEvBlock"></div> -->
     <div id="topArticlesHolder"><div id="_topArticlesHolder"></div></div>
-    <div id="authorSearchHolderEvBlock"></div>
-    <div id="authorSearchHolder"><div id="_authorSearchHolder"></div></div>
+    <!--
+      <div id="authorSearchHolderEvBlock"></div>
+      <div id="authorSearchHolder"><div id="_authorSearchHolder"></div></div>
+    -->
     <div class="reset clear"></div>
   </div>
   <div class="reset clear"></div>
     <% var count = _.reduce(articlesBySection, function(memo, articles) {
       return memo + articles.length;
     }, 0); %>
-    THE <%= count %> MOST COMMENTED ARTICLES, 2007-2010
+    THE MOST COMMENTED ARTICLES ON NYTIMES.COM, 2007-2010
   </div>
   <div class="clear reset"></div>
 
     <div class="omega topblock_3">
       <div class="paddingDiv">
         <div class="majorSectionHeader">
-          DIVIDE THE CROWD TO READ THEIR COMMENTS
+          TOP-LEVEL SEGMENTS
         </div>
       </div>
     </div>

File frontend/js/defuse/controllers/topNArticlesChooser.js

     $clickedDiv.css("width", $clickedDiv.width());
 
     $.when(
+      $("#homeHeader").fadeOut(),
       $(".majorSectionHeaderSubtext").fadeOut(),
       $("#topNArticlesSectionList").fadeOut(),
+      $(".topNArticlesLi:hover").css("background-color", "#333"),
       $clickedDiv.siblings().fadeOut(400)
     ).done(function() {
       // - 50, which is some combo of padding
-      $clickedDiv.animate({top: topPos.top+newMargins["margin-top"]-50,
-                           left: topPos.left,
+      $clickedDiv.animate({top: 0, /*top: topPos.top+newMargins["margin-top"],*/
+                           left: 0, /*topPos.left - 10,*/
                            width: 920,
-                           "margin-left": 0, "margin-right": 0}).promise().done(function() {
+                           "padding": 0,
+                           "margin": 0}).promise().done(function() {
         // not sure where the -10 is coming from, but stabilizes things :/
         // and i don't really care at this point.. thesis is due in a month!
         defuse.animation.setTransitionCss($clickedDiv);
         $clickedDiv.detach()
                    .appendTo(".articleChooser")
                    .css({position: "relative", top:0, left:0,
-                         height: "",
-                         "margin-top": newMargins["margin-top"]-10, "margin-bottom":newMargins["margin-bottom"]});
+                         height: ""});
         finishedCallback();
       });
     });

File frontend/js/defuse/model/filters.js

             { desc:"democrats", desc_singluar:"democrat", type:"democrat", key: "democrat", authorKeys:[] },
             { desc:"republicans", desc_singluar:"republican", key: "republican", authorKeys:[] },
             { desc:"not grouped", type:"unknown", key: "unknown", desc_singluar:"wasn't grouped", authorKeys:[] } ]
-        },
+        }/*,
         { desc: "abortion",
           key: "abortion",
           type: "percentage_community_normalized_bucket",
             { desc:"rarely discuss Iraq", desc_singluar:"rarely discusses Iraq", authorKeys:[] },
             { desc:"often discuss Iraq", desc_singluar:"often discusses Iraq", authorKeys:[] },
             { desc:"heavily discuss Iraq", desc_singluar:"heavily discusses Iraq", authorKeys:[] } ]
-        }
+        }*/
       ]
     },
 
             { desc:"rarely use acronyms", desc_singluar:"rarely uses acronyms", authorKeys:[] },
             { desc:"often use acronyms", desc_singluar:"often uses acronyms", authorKeys:[] },
             { desc:"heavily use acronyms", desc_singluar:"heavily uses acronyms", authorKeys:[] } ]
-        },
+        }/*,
         { desc: "mainstream culture",
           key: "mainstreamculture",
           type: "tagcloud",
           tags: [],
           exploreMoreQuestion: "What mainstream topics do these people discuss?"
-        }
+        }*/
       ]
     },
 
             { desc:"are usually positive", desc_singluar:"is usually positive", authorKeys:[] } ]
         }
       ]
-    },
-
-    { name:"Economic",
-      adverb: "Economically",
-      color: "#FF7BAC",
-      colorName: "pink",
-      questions: "Fashion or function? Are they into finance, or living within their means?",
-      filters: [
-        { desc: "investiment strategies",
-          key: "investiment_strategies",
-          type: "classify",
-          exploreMoreQuestion: "What kinds of investiment strategies do these people deploy?",
-          buckets: [
-            { desc:"no investiments", desc_singluar:"no investiments", authorKeys:[] },
-            { desc:"mostly stocks", desc_singluar:"mostly stocks", authorKeys:[] },
-            { desc:"mostly bonds", desc_singluar:"mostly bonds", authorKeys:[] },
-            { desc:"mostly mutual funds", desc_singluar:"mostly mutual funds", authorKeys:[] },
-            { desc:"mixed strategies", desc_singluar:"mixed strategies", authorKeys:[] },
-            { desc:"not grouped", desc_singluar:"wasn't grouped", type:"unknown", authorKeys:[] } ]
-        },
-        { desc: "capital worth",
-          key: "capital_worth",
-          type: "classify",
-          exploreMoreQuestion: "How much economic capital to these people have?",
-          buckets: [
-            { desc:"very little", desc_singluar:"very little", authorKeys:[] },
-            { desc:"little", desc_singluar:"little", authorKeys:[] },
-            { desc:"average", desc_singluar:"average", authorKeys:[] },
-            { desc:"above average", desc_singluar:"above average", authorKeys:[] },
-            { desc:"a lot", desc_singluar:"a lot", type:"unknown", authorKeys:[] } ]
-        },
-        { desc: "shopping style",
-          key: "shopping_style",
-          type: "classify",
-          exploreMoreQuestion: "How do these people shop?",
-          buckets: [
-            { desc:"minimalists", desc_singluar:"minimalistic", authorKeys:[] },
-            { desc:"thifty", desc_singluar:"thifity", authorKeys:[] },
-            { desc:"average Americans", desc_singluar:"average American", authorKeys:[] },
-            { desc:"higher end", desc_singluar:"higher end", authorKeys:[] },
-            { desc:"high consumption", desc_singluar:"high consumption", authorKeys:[] } ]
-        },
-        { desc: "debt",
-          key: "debt",
-          type: "classify",
-          exploreMoreQuestion: "How much debt are these people in?",
-          buckets: [
-            { desc:"no investiments", desc_singluar:"no investiments", authorKeys:[] },
-            { desc:"mostly stocks", desc_singluar:"mostly stocks", authorKeys:[] },
-            { desc:"mostly bonds", desc_singluar:"mostly bonds", authorKeys:[] },
-            { desc:"mostly mutual funds", desc_singluar:"mostly mutual funds", authorKeys:[] },
-            { desc:"mixed strategies", desc_singluar:"mixed strategies", authorKeys:[] },
-            { desc:"not grouped", desc_singluar:"wasn't grouped", type:"unknown", authorKeys:[] } ]
-        }
-      ]
     }
   ]
 };