switch recent and most used positions

app/views/shared/_metacodeoptions.html.erb

@@ -6,10 +6,10 @@
 <div id="metacodeOptions">
 <ul>
   <li>
-    <span>Most Used</span>
+    <span>Recently Used</span>
     <div class="expandMetacodeSet"></div>
     <ul>
-    	<% user_most_used_metacodes().each do |m| %>
+    	<% user_recent_metacodes().each do |m| %>
 		  <li data-id="<%= m.id.to_s %>">
 		    <img width="24" height="24" src="<%= asset_path m.icon %>" alt="<%= m.name %>" />
 		    <div class="mSelectName"><%= m.name %></div>
@@ -19,10 +19,10 @@
     </ul>
   </li>
   <li>
-    <span>Recently Used</span>
+    <span>Most Used</span>
     <div class="expandMetacodeSet"></div>
     <ul>
-    	<% user_recent_metacodes().each do |m| %>
+    	<% user_most_used_metacodes().each do |m| %>
 		  <li data-id="<%= m.id.to_s %>">
 		    <img width="24" height="24" src="<%= asset_path m.icon %>" alt="<%= m.name %>" />
 		    <div class="mSelectName"><%= m.name %></div>

app/views/shared/_switchmetacodes.html.erb

@@ -8,9 +8,9 @@
 <% allMetacodeSets = MetacodeSet.order("name").all.to_a %>
 <% if selectedSet == "custom" 
      index = allMetacodeSets.length + 2
-   elsif selectedSet == 'Most'
-     index = 0
    elsif selectedSet == 'Recent'
+     index = 0
+   elsif selectedSet == 'Most'
      index = 1
    else
      set = MetacodeSet.find(selectedSet.to_i)
@@ -22,33 +22,13 @@
         
 <div id="metacodeSwitchTabs">
   <ul>
-    <li><a href="#metacodeSwitchTabsMost" data-set-id="most" id="metacodeSetMost">MOST USED</a></li>
     <li><a href="#metacodeSwitchTabsRecent" data-set-id="recent" id="metacodeSetRecent">RECENTLY USED</a></li>
+    <li><a href="#metacodeSwitchTabsMost" data-set-id="most" id="metacodeSetMost">MOST USED</a></li>
     <% allMetacodeSets.each do |m| %>
     <li><a href="#metacodeSwitchTabs<%= m.id %>" data-set-id="<%= m.id %>"><%= m.name %></a></li>
     <% end %>
     <li><a href="#metacodeSwitchTabsCustom" data-set-id="custom" id="metacodeSetCustom">CUSTOM SELECTION</a></li>
   </ul>
-  <% most_used = user_most_used_metacodes() %>
-  <div id="metacodeSwitchTabsMost" 
-       data-metacodes="<%= most_used.map(&:id).join(',') %>">
-    <% @list = '' %>
-    <% most_used.each_with_index do |m, index| %>
-      <% @list += '<li><img src="' + asset_path(m.icon) + '" alt="' + m.name + '" /><p>' + m.name.downcase + '</p><div class="clearfloat"></div></li>' %> 
-    <% end %>
-    <div class="metacodeSwitchTab">
-      <p class="setDesc">The 5 Metacodes you've used the most.</p>
-      <div class="metacodeSetList">
-        <ul>
-          <%= @list.html_safe %>
-        </ul>
-        <div class="clearfloat"></div>
-      </div>
-    </div>
-    <button class="button" onclick="Metamaps.Create.updateMetacodeSet('Most', 0, false);">
-        Switch Set
-    </button>
-  </div>
   <% recent = user_recent_metacodes() %>
   <div id="metacodeSwitchTabsRecent" 
        data-metacodes="<%= recent.map(&:id).join(',') %>">
@@ -65,7 +45,27 @@
         <div class="clearfloat"></div>
       </div>
     </div>
-    <button class="button" onclick="Metamaps.Create.updateMetacodeSet('Recent', 1, false);">
+    <button class="button" onclick="Metamaps.Create.updateMetacodeSet('Recent', 0, false);">
+        Switch Set
+    </button>
+  </div>
+  <% most_used = user_most_used_metacodes() %>
+  <div id="metacodeSwitchTabsMost" 
+       data-metacodes="<%= most_used.map(&:id).join(',') %>">
+    <% @list = '' %>
+    <% most_used.each_with_index do |m, index| %>
+      <% @list += '<li><img src="' + asset_path(m.icon) + '" alt="' + m.name + '" /><p>' + m.name.downcase + '</p><div class="clearfloat"></div></li>' %> 
+    <% end %>
+    <div class="metacodeSwitchTab">
+      <p class="setDesc">The 5 Metacodes you've used the most.</p>
+      <div class="metacodeSetList">
+        <ul>
+          <%= @list.html_safe %>
+        </ul>
+        <div class="clearfloat"></div>
+      </div>
+    </div>
+    <button class="button" onclick="Metamaps.Create.updateMetacodeSet('Most', 1, false);">
         Switch Set
     </button>
   </div>