blitzwing/cryptpad
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'todo' of github.com:xwiki-labs/cryptpad into todo

Browse source
This commit is contained in:
ansuz 2017-07-26 13:29:33 +02:00
commit ba9cab762c
4 changed files with 13 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
customize.dist/messages.js
View file

@ -151,10 +151,12 @@ define(req, function($, Default, Language) {
messages._applyTranslation = function () { messages._applyTranslation = function () {
$('[data-localization]').each(translateText); $('[data-localization]').each(translateText);
$('[data-localization-append]').each(translateAppend); $('[data-localization-append]').each(translateAppend);
$('#pad-iframe').contents().find('[data-localization]').each(translateText);
$('[data-localization-title]').each(translateTitle); $('[data-localization-title]').each(translateTitle);
$('[data-localization-placeholder]').each(translatePlaceholder); $('[data-localization-placeholder]').each(translatePlaceholder);
$('#pad-iframe').contents().find('[data-localization]').each(translateText);
$('#pad-iframe').contents().find('[data-localization-append]').each(translateAppend);
$('#pad-iframe').contents().find('[data-localization-title]').each(translateTitle); $('#pad-iframe').contents().find('[data-localization-title]').each(translateTitle);
$('#pad-iframe').contents().find('[data-localization-placeholder]').each(translatePlaceholder);
}; };
messages.driveReadme = '["BODY",{"class":"cke_editable cke_editable_themed cke_contents_ltr cke_show_borders","contenteditable":"true","spellcheck":"false","style":"color: rgb(51, 51, 51);"},' + messages.driveReadme = '["BODY",{"class":"cke_editable cke_editable_themed cke_contents_ltr cke_show_borders","contenteditable":"true","spellcheck":"false","style":"color: rgb(51, 51, 51);"},' +

2
www/todo/inner.html
View file

@ -11,7 +11,7 @@
<div id="container"> <div id="container">
<div class="cp-create-form"> <div class="cp-create-form">
<input type="text" id="newTodoName" data-localization-placeholder="todo_newTodoNamePlaceholder" /> <input type="text" id="newTodoName" data-localization-placeholder="todo_newTodoNamePlaceholder" />
<button class="btn btn-success" data-localization-title="todo_newTodoNameTitle">Add the task</button> <button class="btn btn-success fa fa-plus" data-localization-title="todo_newTodoNameTitle"></button>
</div> </div>
<div id="tasksList"></div> <div id="tasksList"></div>
</div> </div>

6
www/todo/main.js
View file

@ -59,7 +59,7 @@ define([
return $('<span>', { return $('<span>', {
'class': 'cp-task-checkbox fa ' + checked, 'class': 'cp-task-checkbox fa ' + checked,
//title: title, title: title,
}).on('click', function () { }).on('click', function () {
entry.state = (entry.state + 1) % 2; entry.state = (entry.state + 1) % 2;
if (typeof(cb) === 'function') { if (typeof(cb) === 'function') {
@ -74,8 +74,8 @@ define([
}).appendTo($list); }).appendTo($list);
$taskDiv.data('id', el); $taskDiv.data('id', el);
var $box = makeCheckbox(el, function (state) { makeCheckbox(el, function (/*state*/) {
display(); APP.display();
}) })
.appendTo($taskDiv); .appendTo($taskDiv);

6
www/todo/todo.less
View file

@ -63,6 +63,7 @@ body {
} }
button { button {
cursor: pointer;
border-radius: 0; border-radius: 0;
background-color: darken(@toolbar-todo-bg, 20%); background-color: darken(@toolbar-todo-bg, 20%);
border:0; border:0;
@ -111,4 +112,9 @@ body {
.cp-task-checkbox-unchecked { .cp-task-checkbox-unchecked {
} }
button {
border-radius: 0;
border:0;
}
} }