Merge branch 'develop' of https://github.com/Connoropolous/metamaps_gen002 into develop

app/assets/javascripts/src/Metamaps.js

@@ -683,8 +683,8 @@ Metamaps.TopicCard = {
             link: null
         });
         $('.embeds').empty();
+        $('#addLinkInput input').val("");
         $('.attachments').removeClass('hidden');
-        $('.addAttachment').show();
         $('.CardOnGraph').removeClass('hasAttachment');
     },
     bindShowCardListeners: function (topic) {
@@ -700,21 +700,9 @@ Metamaps.TopicCard = {
         Metamaps.Mapper.get(topic.get('user_id'), setMapperImage)
 
         // starting embed.ly
-        var addLinkFunc = function () {
-            var addLinkDiv ='';
-            var addLinkDesc ='Enter or paste a link';
-            addLinkDiv+='<div class="addLink"><div id="addLinkIcon"></div>';
-            addLinkDiv+='<div id="addLinkInput"><input placeholder="' + addLinkDesc + '"></input>';
-            addLinkDiv+='<div id="addLinkReset"></div></div></div>';
-            $('.addAttachment').hide();
-            $('.attachments').append(addLinkDiv);
-            $('.showcard #addLinkReset').click(resetFunc);
-            $('.showcard #addLinkInput input').bind("paste keyup",inputEmbedFunc);
-            $('#addLinkInput input').focus();
-        };
         var resetFunc = function () {
-            $('.addLink').remove();
-            $('.addAttachment').show();
+            $('#addLinkInput input').val("");
+            $('#addLinkInput input').focus();
         };
         var inputEmbedFunc = function (event) {
             
@@ -734,7 +722,6 @@ Metamaps.TopicCard = {
                         'data-card-description': '0',
                         href: text
                     }).html(text);
-                    $('.addLink').remove();
                     $('.attachments').addClass('hidden');
                     $('.embeds').append(embedlyEl);
                     $('.embeds').append('<div id="embedlyLinkLoader"></div>');
@@ -749,6 +736,8 @@ Metamaps.TopicCard = {
                 }
             }, 100);
         };
+        $('#addLinkReset').click(resetFunc);
+        $('#addLinkInput input').bind("paste keyup",inputEmbedFunc);
 
         // initialize the link card, if there is a link
         if (topic.get('link') && topic.get('link') !== '') {
@@ -760,7 +749,6 @@ Metamaps.TopicCard = {
             loader.show(); // Hidden by default
             embedly('card', document.getElementById('embedlyLink'));
         }
-        $('.showcard #addlink').click(addLinkFunc);
 
 
         var selectingMetacode = false;
@@ -940,9 +928,9 @@ Metamaps.TopicCard = {
         }
 
         if (authorized) {
-            nodeValues.attachments = '<div class="addAttachment">';
-            nodeValues.attachments += '<div id="addlink"><div id="linkIcon" class="attachmentIcon"></div>Attach a link</div>';
-            nodeValues.attachments += '<div id="addupload"><div id="uploadIcon" class="attachmentIcon"></div>Upload a file</div></div>';
+            nodeValues.attachments = '<div class="addLink"><div id="addLinkIcon"></div>';
+            nodeValues.attachments += '<div id="addLinkInput"><input placeholder="Enter or paste a link"></input>';
+            nodeValues.attachments += '<div id="addLinkReset"></div></div></div>';
         } else {
             nodeValues.attachmentsHidden = 'hidden';
             nodeValues.attachments = '';

app/assets/stylesheets/application.css

@@ -1706,11 +1706,11 @@ float: left;
 }
 .ui-tabs-vertical .ui-tabs-nav li a {
     display: block;
-    width: 92%;
-    padding: 4% !important;
+    width: 100%;
+    padding: 4px 0 !important;
 }
 .ui-tabs-vertical .ui-tabs-panel {
-    padding: 5px !important;
+    padding: 0 !important;
     float: right;
     width: 388px;
 }
@@ -1722,12 +1722,13 @@ float: left;
     line-height: 21px;
     border: none;
     background: none;
-}
-#metacodeSwitchTabs .setTitle {
-    
+    padding: 0;
 }
 #metacodeSwitchTabs .setDesc {
     margin-bottom: 5px;
+    font-family: 'din-medium', helvetica, sans-serif;
+    color: #424242;
+    font-size: 14px;
 }
 #switchMetacodes > p {
     margin: 16px 0 16px 0;
@@ -1777,6 +1778,8 @@ float: left;
     background: none;
     font-size: 14px;
     line-height: 14px;
+    font-family: 'din-regular', helvetica, sans-serif;
+    color: #424242;
 }
 #metacodeSwitchTabs button.button {
     width: auto !important;
@@ -2278,7 +2281,7 @@ float: left;
     position:fixed;
     top:50%;
     left:50%;
-    z-index: 4;
+    z-index: 1;
 }
 
 .collabCompass:hover p {

app/assets/stylesheets/base.css

@@ -15,7 +15,7 @@
     background-color:#F5F5F5;
     text-align: left;
     overflow: visible;
-	  z-index:14000;
+	  z-index:2;
     color: #424242;
     border-radius:2px;
     box-shadow: 0px 3px 3px rgba(0,0,0,0.23), 0 3px 3px rgba(0,0,0,0.16);

app/assets/stylesheets/clean.css

@@ -267,14 +267,14 @@
     left: 156px;
 }
 .sidebarSearch .tt-dropdown-menu .minimizeResults, .sidebarSearch .tt-dropdown-menu .maximizeResults {
-    float: right;
     width: 32px;
     height: 32px;
     background-image: url(arrowpermswhite_sprite.png);
     background-repeat: no-repeat;
     cursor: pointer;
-    margin-top: 5px;
-    margin-right: 20px;
+    position: absolute;
+    top: 5px;
+    left: 410px;
 }
 .sidebarSearch .tt-dropdown-menu .minimizeResults {
     background-position-x: 0;

app/views/shared/_switchmetacodes.html.erb

@@ -30,8 +30,8 @@
     <% m.metacodes.sort{|x,y| x.name <=> y.name }.each_with_index do |m, index| %>
       <% @list += '<li><img src="' + m.icon + '" alt="' + m.name + '" /><p>' + m.name.downcase + '</p><div class="clearfloat"></div></li>' %> 
     <% end %>
+    <p class="setDesc"><%= m.desc %></p>
     <div class="metacodeSetList">
-      <p class="setDesc"><%= m.desc %></p>
       <ul>
         <%= @list.html_safe %>
       </ul>
@@ -43,7 +43,7 @@
   </div>
   <% end %>
     <div id="metacodeSwitchTabsCustom">
-        <p class="setTitle">Pick Your Own Metacodes</p>
+        <p class="setDesc">Choose Your Metacodes</p>
         <% @list = '' %>
         <% Metacode.order("name").all.each_with_index do |m, index| %>
           <% if selectedSet == "custom" %>