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

removed typekit for mooo.com, fixed topright_sprite

Browse source
This commit is contained in:
Connor Turland 2014-10-22 21:26:37 -04:00
commit e61a32ebaa
5 changed files with 19 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

BIN
app/assets/images/topright_sprite.png Executable file → Normal file
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 7.9 KiB

After

Width:  |  Height:  |  Size: 7.2 KiB

9
app/assets/javascripts/src/Metamaps.JIT.js
View file

@ -1244,9 +1244,10 @@ Metamaps.JIT = {
// add the proper options to the menu // add the proper options to the menu
var menustring = '<ul>'; var menustring = '<ul>';
if (Metamaps.Active.Mapper) menustring += '<li class="rc-delete"><div class="rc-icon"></div>Delete</li>';
if (Metamaps.Active.Map && Metamaps.Active.Mapper) menustring += '<li class="rc-remove"><div class="rc-icon"></div>Remove from map</li>';
menustring += '<li class="rc-hide"><div class="rc-icon"></div>Hide until refresh</li>'; menustring += '<li class="rc-hide"><div class="rc-icon"></div>Hide until refresh</li>';
if (Metamaps.Active.Map && Metamaps.Active.Mapper) menustring += '<li class="rc-remove"><div class="rc-icon"></div>Remove from map</li>';
if (Metamaps.Active.Mapper) menustring += '<li class="rc-delete"><div class="rc-icon"></div>Delete</li>';
if (!Metamaps.Active.Map) menustring += '<li class="rc-center"><div class="rc-icon"></div>Center this topic</li>'; if (!Metamaps.Active.Map) menustring += '<li class="rc-center"><div class="rc-icon"></div>Center this topic</li>';
menustring += '<li class="rc-popout"><div class="rc-icon"></div>Open in new tab</li>'; menustring += '<li class="rc-popout"><div class="rc-icon"></div>Open in new tab</li>';
@ -1418,11 +1419,11 @@ Metamaps.JIT = {
// add the proper options to the menu // add the proper options to the menu
var menustring = '<ul>'; var menustring = '<ul>';
if (Metamaps.Active.Mapper) menustring += '<li class="rc-delete"><div class="rc-icon"></div>Delete</li>'; menustring += '<li class="rc-hide"><div class="rc-icon"></div>Hide until refresh</li>';
if (Metamaps.Active.Map && Metamaps.Active.Map.authorizeToEdit(Metamaps.Active.Mapper)) { if (Metamaps.Active.Map && Metamaps.Active.Map.authorizeToEdit(Metamaps.Active.Mapper)) {
menustring += '<li class="rc-remove"><div class="rc-icon"></div>Remove from map</li>'; menustring += '<li class="rc-remove"><div class="rc-icon"></div>Remove from map</li>';
} }
menustring += '<li class="rc-hide"><div class="rc-icon"></div>Hide until refresh</li>'; if (Metamaps.Active.Mapper) menustring += '<li class="rc-delete"><div class="rc-icon"></div>Delete</li>';
if (Metamaps.Active.Mapper) { if (Metamaps.Active.Mapper) {
var permOptions = '<ul><li class="changeP toCommons"><div class="rc-perm-icon"></div>commons</li> \ var permOptions = '<ul><li class="changeP toCommons"><div class="rc-perm-icon"></div>commons</li> \

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

@ -1183,15 +1183,16 @@ h3.realtimeBoxTitle {
width: 24px; width: 24px;
height: 24px; height: 24px;
} }
.rightclickmenu .rc-delete .rc-icon { .rightclickmenu .rc-hide .rc-icon {
background-position: 0 -48px; background-position: 0 0;
} }
.rightclickmenu .rc-remove .rc-icon { .rightclickmenu .rc-remove .rc-icon {
background-position: 0 -24px; background-position: 0 -24px;
} }
.rightclickmenu .rc-hide .rc-icon { .rightclickmenu .rc-delete .rc-icon {
background-position: 0 0; background-position: 0 -48px;
} }
.rightclickmenu .rc-center .rc-icon { .rightclickmenu .rc-center .rc-icon {
} }
@ -2737,4 +2738,4 @@ and it won't be important on password protected instances */
script.data-gratipay-username { script.data-gratipay-username {
display: inline; display: inline;
float: left; float: left;
} }

2
app/views/layouts/_googleanalytics.html.erb
View file

@ -11,7 +11,7 @@
(function() { (function() {
var ga = document.createElement('script'); ga.type = 'text/javascript'; ga.async = true; var ga = document.createElement('script'); ga.type = 'text/javascript'; ga.async = true;
ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + 'stats.g.doubleclick.net/dc.js'; ga.src = ('https:' == document.location.protocol ? 'https://ssl.' : 'http://') + 'stats.g.doubleclick.net/dc.js';
var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s); var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s);
})(); })();

13
app/views/layouts/application.html.erb
View file

@ -16,12 +16,13 @@
<%= javascript_include_tag "application" %> <%= javascript_include_tag "application" %>
<!-- for metamaps.thevalueweb.com --> <% if Rails.env.production? %>
<script src="//use.typekit.net/jcy0yfj.js"></script> <!-- for metamaps.thevalueweb.com -->
<!-- for tvw.mooo.com TODO remove --> <script src="//use.typekit.net/jcy0yfj.js"></script>
<script src="//use.typekit.net/poj3rbu.js"></script> <% elsif Rails.env.development? %>
<!-- for localhost development --> <!-- for localhost development -->
<script type="text/javascript" src="//use.typekit.net/tki2nyo.js"></script> <script type="text/javascript" src="//use.typekit.net/tki2nyo.js"></script>
<% end %>
<!-- to initialize all typekits --> <!-- to initialize all typekits -->
<script type="text/javascript">try{Typekit.load();}catch(e){}</script> <script type="text/javascript">try{Typekit.load();}catch(e){}</script>