Merge pull request #369 from 0ip/popup_label_fix_2
Added missing labels
This commit is contained in:
John McLear
commit
364aab2dfa
3 changed files with 96 additions and 148 deletions
|
|
@ -741,56 +741,9 @@ a#topbarmaximize {
|
|||
width: 100%;
|
||||
}
|
||||
|
||||
#settingsmenu {
|
||||
position:absolute;
|
||||
top:40px;
|
||||
right:20px;
|
||||
width:400px;
|
||||
height:135px;
|
||||
z-index:500;
|
||||
padding:10px;
|
||||
border-radius:6px;
|
||||
background:black;
|
||||
background:rgba(0, 0, 0, 0.7);
|
||||
color: #fff;
|
||||
font-size:14px;
|
||||
display:none;
|
||||
}
|
||||
#settingsmenu p {
|
||||
margin: 5px 0;
|
||||
}
|
||||
|
||||
|
||||
#embed {
|
||||
display:none;
|
||||
position:absolute;
|
||||
top:40px;
|
||||
font-size:14px;
|
||||
width:400px;
|
||||
right: 20px;
|
||||
z-index: 500;
|
||||
background-color: #000;
|
||||
color: white;
|
||||
background-color: rgb(0,0,0);
|
||||
background-color: rgba(0,0,0,0.7);
|
||||
padding: 10px;
|
||||
-moz-border-radius: 6px;
|
||||
border-radius: 6px;
|
||||
}
|
||||
|
||||
.right {
|
||||
float:right;
|
||||
}
|
||||
|
||||
#embed input[type=text] {
|
||||
width: 100%;
|
||||
padding: 5px;
|
||||
box-sizing: border-box;
|
||||
-moz-box-sizing: border-box;
|
||||
display:block;
|
||||
margin-top: 10px;
|
||||
}
|
||||
|
||||
ul#colorpickerswatches
|
||||
{
|
||||
padding-left: 3px;
|
||||
|
|
@ -982,38 +935,6 @@ position: relative;
|
|||
top: -5px;
|
||||
}
|
||||
|
||||
#importexport{
|
||||
position:absolute;
|
||||
top:40px;
|
||||
font-size:14px;
|
||||
width:450px;
|
||||
right: 20px;
|
||||
z-index: 500;
|
||||
background-color: #000;
|
||||
color: white;
|
||||
background-color: rgb(0,0,0);
|
||||
background-color: rgba(0,0,0,0.7);
|
||||
padding: 10px;
|
||||
-moz-border-radius: 6px;
|
||||
border-radius: 6px;
|
||||
height:190px;
|
||||
display:none;
|
||||
}
|
||||
|
||||
#import{
|
||||
position:absolute;
|
||||
width:240px;
|
||||
left:10px;
|
||||
line-height:20px;
|
||||
}
|
||||
|
||||
#export{
|
||||
position:absolute;
|
||||
width:180px;
|
||||
right:10px;
|
||||
line-height:20px;
|
||||
}
|
||||
|
||||
.exporttype{
|
||||
margin-top: 2px;
|
||||
background-repeat:no-repeat;
|
||||
|
|
@ -1065,10 +986,6 @@ position: relative;
|
|||
background-position: 0px -459px;
|
||||
}
|
||||
|
||||
#export a{
|
||||
text-decoration: none;
|
||||
}
|
||||
|
||||
#importstatusball{
|
||||
display:none;
|
||||
}
|
||||
|
|
@ -1141,10 +1058,6 @@ width:33px !important;
|
|||
color: #999;
|
||||
}
|
||||
|
||||
label[for=readonlyinput] {
|
||||
margin: 0 10px 0 2px;
|
||||
}
|
||||
|
||||
#qr_center {
|
||||
margin: 10px 10px auto 0;
|
||||
text-align: center;
|
||||
|
|
@ -1250,43 +1163,81 @@ label[for=readonlyinput] {
|
|||
direction:RTL;
|
||||
}
|
||||
|
||||
#settingslocal{
|
||||
left:10px;
|
||||
position:absolute;
|
||||
width:200px;
|
||||
#chattext p {
|
||||
word-wrap: break-word;
|
||||
}
|
||||
|
||||
#settingseveryone{
|
||||
position:absolute;
|
||||
right:10px;
|
||||
width:200px;
|
||||
/* fix for misaligned labels */
|
||||
label {
|
||||
position: relative;
|
||||
bottom: 1px;
|
||||
}
|
||||
|
||||
#settingsline{
|
||||
border-left: 1px solid #fff;
|
||||
height: 110px;
|
||||
position:absolute;
|
||||
width:0px;
|
||||
left:200px;
|
||||
opacity:.8;
|
||||
.right {
|
||||
float:right;
|
||||
}
|
||||
|
||||
.warning{
|
||||
padding:10px;
|
||||
background-color:#FFA4A4;
|
||||
opacity:.8;
|
||||
.popup {
|
||||
font-size: 14px;
|
||||
width: 400px;
|
||||
z-index: 500;
|
||||
padding: 10px;
|
||||
border-radius: 6px;
|
||||
background: #222;
|
||||
background: rgba(0,0,0,.7);
|
||||
background: -webkit-linear-gradient(rgba(0,0,0,.6), rgba(0,0,0,.7) 35px, rgba(0,0,0,.6));
|
||||
background: -moz-linear-gradient(rgba(0,0,0,.6), rgba(0,0,0,.7) 35px, rgba(0,0,0,.6));
|
||||
box-shadow: 0 0 8px #888;
|
||||
color: #fff;
|
||||
}
|
||||
|
||||
#settingseveryoneitems{
|
||||
display:none;
|
||||
.popup input[type=text] {
|
||||
width: 100%;
|
||||
padding: 5px;
|
||||
box-sizing: border-box;
|
||||
-moz-box-sizing: border-box;
|
||||
display:block;
|
||||
margin-top: 10px;
|
||||
}
|
||||
|
||||
#settingswarning{
|
||||
cursor: pointer;
|
||||
-webkit-user-select: none;
|
||||
-khtml-user-select: none;
|
||||
-moz-user-select: none;
|
||||
-ms-user-select: none;
|
||||
-o-user-select: none;
|
||||
user-select: none;
|
||||
.popup a {
|
||||
text-decoration: none;
|
||||
}
|
||||
|
||||
.popup h1 {
|
||||
font-size: 18px;
|
||||
}
|
||||
.popup h2 {
|
||||
font-size: 15px;
|
||||
}
|
||||
.popup p {
|
||||
margin: 5px 0;
|
||||
}
|
||||
|
||||
.left_popup {
|
||||
float: left;
|
||||
width: 50%;
|
||||
}
|
||||
|
||||
.right_popup {
|
||||
float: left;
|
||||
padding-left: 10px;
|
||||
}
|
||||
|
||||
#settingsmenu, #importexport, #embed {
|
||||
position: absolute;
|
||||
top: 55px;
|
||||
right: 20px;
|
||||
display: none;
|
||||
}
|
||||
|
||||
#settingsmenu .right_menu {
|
||||
float:none;
|
||||
}
|
||||
|
||||
.note {
|
||||
color: #ddd;
|
||||
font-size: 11px;
|
||||
font-weight: bold;
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -451,10 +451,6 @@ var pad = {
|
|||
|
||||
$("#widthprefcheck").click(pad.toggleWidthPref);
|
||||
$("#sidebarcheck").click(pad.toggleSidebar);
|
||||
$("#settingswarning").click(function(){
|
||||
$("#settingswarning").hide();
|
||||
$("#settingseveryoneitems").show();
|
||||
});
|
||||
|
||||
pad.myUserInfo = {
|
||||
userId: clientVars.userId,
|
||||
|
|
|
|||
|
|
@ -139,18 +139,21 @@
|
|||
<div id="editorloadingbox">Loading...</div>
|
||||
</div>
|
||||
|
||||
<div id="settingsmenu">
|
||||
<h3>Pad settings</h3>
|
||||
<div id="settingslocal">
|
||||
<h4>My view only</h4>
|
||||
<div id="settingsmenu" class="popup">
|
||||
<h1>Pad settings</h1>
|
||||
<div class="left_popup">
|
||||
<h2>My view</h2>
|
||||
<p>
|
||||
<input type="checkbox" id="options-stickychat" onClick="chat.stickToScreen();"> Chat always on screen
|
||||
<input type="checkbox" id="options-stickychat" onClick="chat.stickToScreen();">
|
||||
<label for="options-stickychat">Chat always on screen</label>
|
||||
</p>
|
||||
<p>
|
||||
<input type="checkbox" id="options-colorscheck" checked> Authorship colors
|
||||
<input type="checkbox" id="options-colorscheck" checked>
|
||||
<label for="options-colorscheck">Authorship colors</label>
|
||||
</p>
|
||||
<p>
|
||||
<input type="checkbox" id="options-linenoscheck" checked> Line numbers
|
||||
<input type="checkbox" id="options-linenoscheck" checked>
|
||||
<label for="options-linenoscheck">Line numbers</label>
|
||||
</p>
|
||||
<p>
|
||||
Font type:
|
||||
|
|
@ -159,21 +162,17 @@
|
|||
<option value="monospace">Monospaced</option>
|
||||
</select>
|
||||
</p>
|
||||
|
||||
</div>
|
||||
<div id="settingsline"></div>
|
||||
<div id="settingseveryone">
|
||||
<h4>Everyones view</h4>
|
||||
<p><div id=settingswarning class=warning>Warning:<br/>These options affect everyone viewing this pad.</div></p>
|
||||
<div id="settingseveryoneitems">There are no settings currently available to alter everyones view</div>
|
||||
<div class="right_popup">
|
||||
<h2>Global view</h2>
|
||||
<p>Currently nothing.</p>
|
||||
<p class="note">These options affect everyone viewing this pad.</p>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div id="importexport">
|
||||
<div id="import">
|
||||
<h3>Import/Export</h3>
|
||||
Import from text file, HTML, PDF, Word, ODT or RTF:
|
||||
<br><br>
|
||||
<div id="importexport" class="popup">
|
||||
<div class="left_popup">
|
||||
<h2>Import from text file, HTML, PDF, Word, ODT or RTF</h2><br>
|
||||
<form id="importform" method="post" action="" target="importiframe" enctype="multipart/form-data">
|
||||
<div class="importformdiv" id="importformfilediv">
|
||||
<input type="file" name="file" size="15" id="importfileinput">
|
||||
|
|
@ -190,9 +189,8 @@
|
|||
</div>
|
||||
</form>
|
||||
</div>
|
||||
<div id="importexportline"></div>
|
||||
<div id="export">
|
||||
Export current pad as:
|
||||
<div class="right_popup">
|
||||
<h2>Export current pad as</h2>
|
||||
<a id="exporthtmla" target="_blank" class="exportlink"><div class="exporttype" id="exporthtml">HTML</div></a>
|
||||
<a id="exportplaina" target="_blank" class="exportlink"><div class="exporttype" id="exportplain">Plain text</div></a>
|
||||
<a id="exportworda" target="_blank" class="exportlink"><div class="exporttype" id="exportword">Microsoft Word</div></a>
|
||||
|
|
@ -203,21 +201,24 @@
|
|||
</div>
|
||||
</div>
|
||||
|
||||
<div id="embed">
|
||||
<div id="embed" class="popup">
|
||||
<div id="embedreadonly" class="right">
|
||||
<input type="checkbox" id="readonlyinput" onClick="padeditbar.setEmbedLinks();"> Read only
|
||||
<input type="checkbox" id="readonlyinput" onClick="padeditbar.setEmbedLinks();">
|
||||
<label for="readonlyinput">Read only</label>
|
||||
</div>
|
||||
<h3>Share this pad</h3>
|
||||
<h1>Share this pad</h1>
|
||||
<div id="linkcode">
|
||||
<label for="linkinput">Link</label><input id="linkinput" type="text" value="">
|
||||
<h2>Link</h2>
|
||||
<input id="linkinput" type="text" value="">
|
||||
</div>
|
||||
<br>
|
||||
<div id="embedcode">
|
||||
<label for="embedinput">Embed URL</label><input id="embedinput" type="text" value="">
|
||||
<h2>Embed URL</h2>
|
||||
<input id="embedinput" type="text" value="">
|
||||
</div>
|
||||
<br>
|
||||
<div id="qrcode">
|
||||
<label for="embedreadonlyqr">QR code</label><br/>
|
||||
<h2>QR code</h2>
|
||||
<div id="qr_center"><img id="embedreadonlyqr"></div>
|
||||
</div>
|
||||
</div>
|
||||
|
|
|
|||
Loading…
Reference in a new issue