All4DK
/
wikipoints
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ADD скрытие фотобанка про ESC; Добалены кнопка и пояснение для подчеркивания

This commit is contained in:
Krivchikov Dmitry 2015-09-23 18:58:42 +03:00
parent 42edd409f6
commit 64d4d62e43
4 changed files with 50 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
ground/views/articles/edit.php
View File

@ -25,8 +25,9 @@
<button type="submit" id="submitButton" class="btn btn-sm btn-success" title="Сохранить"><span class="glyphicon glyphicon-floppy-saved" aria-hidden="true"></span> сохранить</button> <button type="submit" id="submitButton" class="btn btn-sm btn-success" title="Сохранить"><span class="glyphicon glyphicon-floppy-saved" aria-hidden="true"></span> сохранить</button>
</div> </div>
<div class="btn-group" role="group" aria-label="..."> <div class="btn-group" role="group" aria-label="...">
<button type="button" class="btn btn-default btn-sm" title="Жирый" onclick="markBold()"><span class="glyphicon glyphicon-bold" aria-hidden="true"></span></button> <button type="button" class="btn btn-default btn-sm" title="Жирый" onclick="markBold()"><b>Ж</b></button>
<button type="button" class="btn btn-default btn-sm" title="Курсив" onclick="markItalic()"><span class="glyphicon glyphicon-italic" aria-hidden="true"></span></button> <button type="button" class="btn btn-default btn-sm" title="Курсив" onclick="markItalic()"><i>К</i></button>
<button type="button" class="btn btn-default btn-sm" title="Подчеркивание" onclick="markUnderline()"><u>П</u></button>
<button type="button" class="btn btn-default btn-sm" title="Фото или картинка" onclick="togglePhotobank()"><span class="glyphicon glyphicon-camera" aria-hidden="true"></span></button> <button type="button" class="btn btn-default btn-sm" title="Фото или картинка" onclick="togglePhotobank()"><span class="glyphicon glyphicon-camera" aria-hidden="true"></span></button>
<button type="button" class="btn btn-default btn-sm" title="Ссылка на точку" onclick="insertPoint()"><span class="glyphicon glyphicon-map-marker" aria-hidden="true"></span></button> <button type="button" class="btn btn-default btn-sm" title="Ссылка на точку" onclick="insertPoint()"><span class="glyphicon glyphicon-map-marker" aria-hidden="true"></span></button>
<button type="button" class="btn btn-default btn-sm" title="Подсказка по разметке" onclick="$('#articleInfoModal').modal('show');"><span class="glyphicon glyphicon-info-sign" aria-hidden="true"></span> разметка</button> <button type="button" class="btn btn-default btn-sm" title="Подсказка по разметке" onclick="$('#articleInfoModal').modal('show');"><span class="glyphicon glyphicon-info-sign" aria-hidden="true"></span> разметка</button>
@ -43,25 +44,28 @@
</form> </form>
<div id="photobankContainer"> <div id="photobankContainer">
<div style="margin: 5px 10px;"> <span class="glyphicon glyphicon-remove pull-right" style="color: #fff; margin: 5px;font-size: 18px; cursor: pointer;" onclick="togglePhotobank()" aria-hidden="true"></span>
<form enctype="multipart/form-data" id="articlePhotoloader" action="/images/loadPhoto" method="POST" name="loadavatar" target="hiddenframe" class="form-inline"> <div style="margin: 5px 10px;">
<input type="hidden" name="MAX_FILE_SIZE" value="5242880" /> <form enctype="multipart/form-data" id="articlePhotoloader" action="/images/loadPhoto" method="POST" name="loadavatar" target="hiddenframe" class="form-inline">
<div class="form-group"> <input type="hidden" name="MAX_FILE_SIZE" value="5242880" />
<label style="color: white;">Загрузить новое изображение (MAX 5MB) (jpg, png)</label> <div class="form-group">
</div> <label style="color: white;">Загрузить новое изображение (MAX 5MB) (jpg, png)</label>
<br/> </div>
<div class="form-group"> <br/>
<input id="photo" name="photo" type="file" class="form-control" accept=".jpg,.png,.jpeg" /> <div class="form-group">
</div> <input id="photo" name="photo" type="file" class="form-control" accept=".jpg,.png,.jpeg" />
<div class="form-group"> </div>
<input id="caption" name="caption" type="text" class="form-control" placeholder="Описание (по желанию)" /> <div class="form-group">
</div> <input id="caption" name="caption" type="text" class="form-control" placeholder="Описание (по желанию)" />
<div class="form-group"> </div>
<button type="submit" class="btn btn-sm btn-default">Загрузить на сервер</button> <div class="form-group">
</div> <button type="submit" class="btn btn-sm btn-default">Загрузить на сервер</button>
</form> </div>
</form>
</div>
<div class="col-md-12" id="photobank"></div>
</div> </div>
<div class="col-md-12" id="photobank"></div> <iframe id="hiddenframe" name="hiddenframe" style="width:0px; height:0px; border:0px" onload="$(document).ready(function () {
</div> updatePhotobank()
<iframe id="hiddenframe" name="hiddenframe" style="width:0px; height:0px; border:0px" onload="$(document).ready(function(){updatePhotobank()})"></iframe> })"></iframe>
<?= self::renderPartial('modals/articleInfo.php', array(), true) ?> <?= self::renderPartial('modals/articleInfo.php', array(), true) ?>

4
ground/views/modals/articleInfo.php
View File

@ -34,6 +34,10 @@
<td>**жирный**</td> <td>**жирный**</td>
<td><b>жирный</b></td> <td><b>жирный</b></td>
</tr> </tr>
<tr>
<td>_подчеркивание_</td>
<td><u>подчеркивание</u></td>
</tr>
<tr> <tr>
<td>--</td> <td>--</td>
<td>—</td> <td>—</td>

11
public/css/articleEdit.css
View File

@ -1,4 +1,3 @@
/*body {overflow-y: scroll;}*/
#inputHeader {width: 100%;} #inputHeader {width: 100%;}
#inputHeader div.form-group {width: 100%;} #inputHeader div.form-group {width: 100%;}
input#articleTitle {font-size: 30px;font-weight: 600;height: 45px; border-radius: 0;} input#articleTitle {font-size: 30px;font-weight: 600;height: 45px; border-radius: 0;}
@ -8,14 +7,8 @@ input#articleTitle {font-size: 30px;font-weight: 600;height: 45px; border-radius
.nopaddingy {padding-bottom: 0;padding-top: 0;} .nopaddingy {padding-bottom: 0;padding-top: 0;}
#articleText {border-radius:0;} #articleText {border-radius:0;}
#articleText { #articleText {width: 100%;-webkit-box-sizing: border-box;-moz-box-sizing: border-box;box-sizing: border-box;font-family: monospace;color: #fffbec;background-color: #1e1e1e;}
width: 100%;
-webkit-box-sizing: border-box; /* Safari/Chrome, other WebKit */
-moz-box-sizing: border-box; /* Firefox, other Gecko */
box-sizing: border-box; /* Opera/IE 8+ */
}
/*#monitor {background-color: white; overflow-y: scroll; padding: 5px 10px; border: solid 1px #ccc; border-radius: 0px;}*/
#monitor {height: 100%; width: 100%; background-color: white; overflow-y: scroll; padding: 5px 10px; border: solid 1px #ccc; border-radius: 0px;} #monitor {height: 100%; width: 100%; background-color: white; overflow-y: scroll; padding: 5px 10px; border: solid 1px #ccc; border-radius: 0px;}
#photobankContainer {position: absolute; top: 0; right: 0px; width: 675px; background-color: rgba(55,55,55, 0.8); overflow-y: scroll; height: 100%;} #photobankContainer {position: absolute; top: 0; right: 0px; width: 675px; background-color: rgba(55,55,55, 0.8); overflow-y: scroll; height: 100%;}
#photobankContainer {display: none;} #photobankContainer {display: none;}

20
public/js/articleEdit.js
View File

@ -44,10 +44,19 @@ function markItalic()
markdown(); markdown();
} }
function markUnderline()
{
wrapText('articleText', '_', '_');
markdown();
}
function insertPoint() function insertPoint()
{ {
insertAtCursor('articleText', '[#' + prompt('Укажите номер точки', '') + '|ссылка на точку]'); pointId = prompt('Укажите номер точки', '');
markdown(); if (pointId) {
insertAtCursor('articleText', '[#' + pointId + '|ссылка на точку]');
markdown();
}
} }
function insertAtCursor(myFieldId, myValue) { function insertAtCursor(myFieldId, myValue) {
@ -107,6 +116,13 @@ $('#articleText').keyup(function () {
$(document).ready(function () { $(document).ready(function () {
markdown(); markdown();
$('#articleText').focus(); $('#articleText').focus();
$(document).keyup(function (e) {
if (e.keyCode == 27) { // escape key maps to keycode `27`
if ($('#photobankContainer').css('display') == 'block') {
togglePhotobank();
}
}
});
}); });
function togglePhotobank() function togglePhotobank()