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

styled buttons

Browse source
This commit is contained in:
Connor Turland 2013-01-07 23:40:58 -05:00
parent f48659288c
commit e1ece299cc
6 changed files with 34 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/assets/javascripts/Jit/graphsettings.js
View file

@ -451,7 +451,7 @@ function editEdge(edge, e) {
$('#edit_synapse').focusout(function() { $('#edit_synapse').focusout(function() {
//in case they cancel //in case they cancel
// $('#edit_synapse').hide(); $('#edit_synapse').hide();
}); });
//css stuff above moves it, this activates it //css stuff above moves it, this activates it

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

@ -83,7 +83,7 @@ a {
clear:both; clear:both;
} }
.spacer { .leaveSpace {
display:block; display:block;
height:50px; height:50px;
} }
@ -238,8 +238,20 @@ input[type="submit"] {
margin:10px; margin:10px;
} }
.headertop button { .headertop button, .headertop input {
float:left; float:left;
height: 30px;
border-radius: 12px;
background: url('black_bg.png');
color: #FFF;
font-family: 'katarine-web';
font-size: 18px;
border: 1px solid #000;
cursor: pointer;
}
.headertop button:hover, .headertop input:hover {
background: #000;
} }
.wrapper { .wrapper {

2
app/assets/stylesheets/maps.css.scss
View file

@ -12,7 +12,7 @@
} }
.saveMapLayout input { .saveMapLayout input {
margin-top:2px; margin-top:0px;
} }
#MapRealtime { #MapRealtime {

2
app/views/main/home.html.erb
View file

@ -22,7 +22,7 @@
<%= render map %> <%= render map %>
<% end %> <% end %>
</div> </div>
<div class="clearfloat spacer"></div> <div class="clearfloat leaveSpace"></div>
</div> </div>

15
app/views/maps/show.html.erb
View file

@ -23,7 +23,9 @@
<div class="clearfloat nodemargin"></div>--> <div class="clearfloat nodemargin"></div>-->
<div class="headertop"> <div class="headertop">
<% if false %>
<button onclick="if (!goRealtime) { this.innerHTML = 'Stop Realtime'; $('#saveLayout').css('display','none');} else if (goRealtime) { this.innerHTML = 'Start Realtime'; $('#saveLayout').css('display','block');} goRealtime = !goRealtime;">Start Realtime</button> <button onclick="if (!goRealtime) { this.innerHTML = 'Stop Realtime'; $('#saveLayout').css('display','none');} else if (goRealtime) { this.innerHTML = 'Start Realtime'; $('#saveLayout').css('display','block');} goRealtime = !goRealtime;">Start Realtime</button>
<% end %>
<button onclick="hideSelectedEdges();hideSelectedNodes();">Hide Selected</button> <button onclick="hideSelectedEdges();hideSelectedNodes();">Hide Selected</button>
<% if authenticated? %> <% if authenticated? %>
<button onclick="removeSelectedEdges();removeSelectedNodes();">Remove Selected From Map</button> <button onclick="removeSelectedEdges();removeSelectedNodes();">Remove Selected From Map</button>
@ -47,6 +49,9 @@
Viewing Map: Viewing Map:
<% end %> <% end %>
<%= @map.name %> <%= @map.name %>
<% if (@map.permission == "commons" && authenticated?) || @map.user == user %>
<%= link_to "[edit]", edit_map_path(@map) %>
<% end %>
</h1> </h1>
<div class="maps onMap" id="container"> <div class="maps onMap" id="container">
@ -61,18 +66,22 @@
<%= render :partial => 'newsynapse' %> <%= render :partial => 'newsynapse' %>
<%= render :partial => 'maps/new' %> <%= render :partial => 'maps/new' %>
<% end %> <% end %>
<%= form_for @map, :url => realtime_path(@map), :method => "GET", :html => { :id => "MapRealtime"}, remote: true do |form| %>
<% if false %>
<%= form_for @map, :url => realtime_path(@map), :method => "GET", :html => { :id => "MapRealtime"}, remote: true do |form| %>
<%= form.hidden_field :time, :value => Time.now.to_i %> <%= form.hidden_field :time, :value => Time.now.to_i %>
<%= form.hidden_field :ids, :value => 0 %> <%= form.hidden_field :ids, :value => 0 %>
<% end %>
<% end %> <% end %>
<script> <script>
var dragged = 0; var dragged = 0;
mapid = <%= @map.id %>; mapid = <%= @map.id %>;
var int = setInterval(function(){ /*var int = setInterval(function(){
if (goRealtime) { if (goRealtime) {
$('#MapRealtime').submit(); $('#MapRealtime').submit();
} }
},4000); },4000);*/
</script> </script>
<script> <script>

2
app/views/users/show.html.erb
View file

@ -41,7 +41,7 @@
<%= render map %> <%= render map %>
<% end %> <% end %>
</div> </div>
<div class="clearfloat spacer"></div> <div class="clearfloat leaveSpace"></div>
</div> </div>