Skip to content

Commit

Permalink
add link buttons (#18)
Browse files Browse the repository at this point in the history
  • Loading branch information
RouxRC committed May 6, 2017
1 parent 7bdd6f1 commit 6bff79f
Show file tree
Hide file tree
Showing 5 changed files with 24 additions and 17 deletions.
6 changes: 6 additions & 0 deletions web/css/bootstrap.min.css

Large diffs are not rendered by default.

20 changes: 7 additions & 13 deletions web/css/webmonitor.css
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,7 @@ h1 {
}
#differ input {
position: absolute;
margin: 2px;
}
#differ .copy input {
right: 50%;
Expand All @@ -69,7 +70,9 @@ h1 {
text-align: center;
font-size: 13px;
font-weight: bold;
padding-top: 4px;
}
#differ .version a span {
font-size: 11px;
}
.title {
clear: both;
Expand Down Expand Up @@ -97,6 +100,9 @@ h1 {
.differ {
height: 248px;
}
.differ .CodeMirror-lines {
background-color: #F5FFFF;
}
.mergely-canvas {
background-color: #eafaff;
}
Expand Down Expand Up @@ -124,15 +130,3 @@ h1 {
.orig iframe {
border-left: 1px solid black;
}
.links {
background-color: #F5FFFF;
}
.text {
background-color: #F5F5FF;
}
.content {
padding: 5px;
font-family: monospace;
font-size: 11px;
white-space: pre-wrap;
}
Binary file added web/fonts/glyphicons-halflings-regular.woff2
Binary file not shown.
4 changes: 2 additions & 2 deletions web/js/webmonitor.js
Original file line number Diff line number Diff line change
Expand Up @@ -59,8 +59,8 @@
curwin = curwin || ns.currentwin;
$(".select" + curwin).removeClass('select' + curwin);
$("#" + version).addClass('select' + curwin);
$("." + curwin + " a").text(name)
.attr("href", url);
$("." + curwin + " .text").text(name)
$("." + curwin + " a").attr("href", url);
$("." + curwin + " iframe").attr("src", url);
["links", "text"].forEach(function(typ){
ns.mergely[typ].mergely('scrollTo', 'l', 0);
Expand Down
11 changes: 9 additions & 2 deletions web/templates/monitor.html
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
<head>
<meta content="text/html; charset=utf-8" http-equiv="content-type"/>
<title>Gazouilleur's WebMonitor for {{name}}: {{url}}</title>
<link type="text/css" rel="stylesheet" href="css/bootstrap.min.css">
<link type="text/css" rel="stylesheet" href="css/codemirror.css" />
<link type="text/css" rel="stylesheet" href="css/mergely.css" />
<link rel=stylesheet href="css/webmonitor.css" />
Expand All @@ -26,11 +27,17 @@ <h1>
<div id="differ">
<div class="copy">
<input type="radio" name="curwin" value="copy" checked />
<p class="version"><a target="_blank"></a></p>
<p class="version">
<span class="text"></span>
<a target="_blank"><span class="glyphicon glyphicon-link"></span></a>
</p>
</div>
<div class="orig">
<input type="radio" name="curwin" value="orig" />
<p class="version"><a target="_blank"></a></p>
<p class="version">
<span class="text"></span>
<a target="_blank"><span class="glyphicon glyphicon-link"></span></a>
</p>
</div>
<div class="title"><p>RAW TEXT</p></div>
<div id="difftext"><div class="differ"><div id="mergely-text"></div></div></div>
Expand Down

0 comments on commit 6bff79f

Please sign in to comment.