glenux-contrib/metamaps--metamaps
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

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

Browse source
This commit is contained in:
Connor Turland 2014-09-18 02:33:44 -04:00
commit 683b459eeb
2 changed files with 19 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
app/assets/stylesheets/application.css
View file

@ -1413,6 +1413,7 @@ float: left;
font-size: 17px; font-size: 17px;
line-height: 21px; line-height: 21px;
border: none; border: none;
background: none;
} }
#metacodeSwitchTabs .setTitle { #metacodeSwitchTabs .setTitle {
@ -1420,12 +1421,24 @@ float: left;
#metacodeSwitchTabs .setDesc { #metacodeSwitchTabs .setDesc {
margin-bottom: 5px; margin-bottom: 5px;
} }
#switchMetacodes > p {
margin: 16px 0 16px 0;
}
#metacodeSwitchTabs > ul {
width: 130px;
}
#metacodeSwitchTabs > ul li {
font-size: 14px;
}
#metacodeSwitchTabs li.ui-state-active a {
color: #00BCD4;
}
.customMetacodeList, .customMetacodeList,
.metacodeSetList { .metacodeSetList {
height: 301px; height: 301px;
overflow: hidden; overflow: hidden;
margin: 5px 0 15px 0; margin: 5px 0 15px 0;
border-bottom: 1px solid #BBB; /* border-bottom: 1px solid #BBB;*/
} }
.customMetacodeList ul li { .customMetacodeList ul li {
cursor: pointer; cursor: pointer;
@ -1461,6 +1474,7 @@ float: left;
width: auto !important; width: auto !important;
padding: 0 10px; padding: 0 10px;
font-weight: normal; font-weight: normal;
float: right;
} }
/* about, getInvolved */ /* about, getInvolved */

7
app/views/shared/_switchmetacodes.html.erb
View file

@ -14,17 +14,18 @@
end %> end %>
<h3>Switch Metacode Set</h3> <h3>Switch Metacode Set</h3>
<p>Use metacode sets to enter different modes of mapping.</p>
<div id="metacodeSwitchTabs"> <div id="metacodeSwitchTabs">
<ul> <ul>
<% allMetacodeSets.each do |m| %> <% allMetacodeSets.each do |m| %>
<li><a href="#metacodeSwitchTabs<%= m.id %>" data-set-id="<%= m.id %>"><%= m.name %></a></li> <li><a href="#metacodeSwitchTabs<%= m.id %>" data-set-id="<%= m.id %>"><%= m.name %></a></li>
<% end %> <% end %>
<li><a href="#metacodeSwitchTabsCustom" data-set-id="custom" id="metacodeSetCustom">Custom</a></li> <li><a href="#metacodeSwitchTabsCustom" data-set-id="custom" id="metacodeSetCustom">CUSTOM SELECTION</a></li>
</ul> </ul>
<% allMetacodeSets.each_with_index do |m, localindex| %> <% allMetacodeSets.each_with_index do |m, localindex| %>
<div id="metacodeSwitchTabs<%= m.id %>" <div id="metacodeSwitchTabs<%= m.id %>"
data-metacodes="<%= m.metacodes.map(&:name).join(',') %>"> data-metacodes="<%= m.metacodes.map(&:name).join(',') %>">
<p class="setTitle"><%= m.name %></p>
<% @list = '' %> <% @list = '' %>
<% m.metacodes.sort{|x,y| x.name <=> y.name }.each_with_index do |m, index| %> <% 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>' %> <% @list += '<li><img src="' + m.icon + '" alt="' + m.name + '" /><p>' + m.name.downcase + '</p><div class="clearfloat"></div></li>' %>
@ -37,7 +38,7 @@
<div class="clearfloat"></div> <div class="clearfloat"></div>
</div> </div>
<button class="button" onclick="Metamaps.Create.updateMetacodeSet(<%= m.id %>, <%= localindex %>, false);"> <button class="button" onclick="Metamaps.Create.updateMetacodeSet(<%= m.id %>, <%= localindex %>, false);">
Switch to Set Switch Set
</button> </button>
</div> </div>
<% end %> <% end %>