Merge branch 'thevalueweb' of github.com:Connoropolous/metamaps_gen002 into tvw

This commit is contained in:
Connor Turland 2014-11-11 07:06:30 -05:00
commit 7e828aa973

View file

@ -25,7 +25,7 @@
<div class="permIcon" data-permission="commons"> <div class="permIcon" data-permission="commons">
<div id="newmap_co" class="mapCommonsIcon mapPermIcon selected"> <div id="newmap_co" class="mapCommonsIcon mapPermIcon selected">
<div class="tip"> <div class="tip">
Collaborate with other mappers on editing this map. Those without accounts can view this map. Collaborate with other mappers on editing this map. Only those with accounts can view this map.
</div> </div>
</div> </div>
<h4>COMMONS</h4> <h4>COMMONS</h4>
@ -33,7 +33,7 @@
<div class="permIcon" data-permission="public"> <div class="permIcon" data-permission="public">
<div id="newmap_pu" class="mapPublicIcon mapPermIcon"> <div id="newmap_pu" class="mapPublicIcon mapPermIcon">
<div class="tip"> <div class="tip">
Anyone, with or without an account, can view this map but not edit anything. Anyone, with an account can view this map but not edit anything.
</div> </div>
</div> </div>
<h4>PUBLIC</h4> <h4>PUBLIC</h4>
@ -48,7 +48,7 @@
</div> </div>
<div class="clearfloat"></div> <div class="clearfloat"></div>
</div> </div>
<p class="permText">Collaborate with other mappers on editing this map. Those without accounts can view this map.</p> <p class="permText">Collaborate with other mappers on editing this map. Everyone with an account can view this map.</p>
<div class="clearfloat"></div> <div class="clearfloat"></div>
</div> </div>