Skip to content

Commit

Permalink
app stickies
Browse files Browse the repository at this point in the history
  • Loading branch information
alexmuz committed Jul 24, 2015
1 parent 8fee644 commit 62be82c
Show file tree
Hide file tree
Showing 25 changed files with 97 additions and 40 deletions.
5 changes: 5 additions & 0 deletions wa-apps/stickies/api/v1/errors.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
<?php

return array(
100 => _w("Not enough rights to work with current board"),
);
2 changes: 1 addition & 1 deletion wa-apps/stickies/api/v1/stickies.sheet.add.method.php
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?php
/**
*
* @author WebAsyst Team
* @author Webasyst
*
*/
class stickiesSheetAddMethod extends waAPIMethod
Expand Down
2 changes: 1 addition & 1 deletion wa-apps/stickies/api/v1/stickies.sheet.delete.method.php
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?php
/**
*
* @author WebAsyst Team
* @author Webasyst
*
*/
class stickiesSheetDeleteMethod extends waAPIMethod
Expand Down
2 changes: 1 addition & 1 deletion wa-apps/stickies/api/v1/stickies.sheet.getInfo.method.php
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?php
/**
*
* @author WebAsyst Team
* @author Webasyst
*
*/
class stickiesSheetGetInfoMethod extends stickiesAPIMethod
Expand Down
2 changes: 1 addition & 1 deletion wa-apps/stickies/api/v1/stickies.sheet.getList.method.php
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?php
/**
*
* @author WebAsyst Team
* @author Webasyst
*
*/
class stickiesSheetGetListMethod extends waAPIMethod
Expand Down
2 changes: 1 addition & 1 deletion wa-apps/stickies/api/v1/stickies.sheet.update.method.php
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?php
/**
*
* @author WebAsyst Team
* @author Webasyst
*
*/
class stickiesSheetUpdateMethod extends waAPIMethod
Expand Down
2 changes: 1 addition & 1 deletion wa-apps/stickies/api/v1/stickies.sticky.add.method.php
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?php
/**
*
* @author WebAsyst Team
* @author Webasyst
*
*/
class stickiesStickyAddMethod extends stickiesAPIMethod
Expand Down
2 changes: 1 addition & 1 deletion wa-apps/stickies/api/v1/stickies.sticky.delete.method.php
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?php
/**
*
* @author WebAsyst Team
* @author Webasyst
*
*/
class stickiesStickyDeleteMethod extends stickiesAPIMethod
Expand Down
2 changes: 1 addition & 1 deletion wa-apps/stickies/api/v1/stickies.sticky.getInfo.method.php
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?php
/**
*
* @author WebAsyst Team
* @author Webasyst
*
*/
class stickiesStickyGetInfoMethod extends stickiesAPIMethod
Expand Down
2 changes: 1 addition & 1 deletion wa-apps/stickies/api/v1/stickies.sticky.getList.method.php
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?php
/**
*
* @author WebAsyst Team
* @author Webasyst
*
*/
class stickiesStickyGetListMethod extends stickiesAPIMethod
Expand Down
2 changes: 1 addition & 1 deletion wa-apps/stickies/api/v1/stickies.sticky.update.method.php
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?php
/**
*
* @author WebAsyst Team
* @author Webasyst
*
*/
class stickiesStickyUpdateMethod extends stickiesAPIMethod
Expand Down
18 changes: 9 additions & 9 deletions wa-apps/stickies/css/stickies.css
Original file line number Diff line number Diff line change
Expand Up @@ -22,19 +22,19 @@ body{
}

.sticky .sticky-resizable-se {
width: 17px;
height: 17px;
position: absolute;
right: -5px;
width: 17px;
height: 17px;
position: absolute;
right: -5px;
bottom: -5px;
background: url('../img/resize.png') no-repeat;
background: url('../img/resize.png') no-repeat;
background-position: 3px 3px;
}

#wa-system-notice {
left: 0;
width: 100%;
bottom: 0px;
bottom: 0;
max-height: 30%;
padding: 0;
overflow: auto;
Expand Down Expand Up @@ -82,7 +82,7 @@ input { font-size: 0.9em; }
.stickies-sidebar-scrolable { position: relative; overflow:auto; overflow-x:hidden; height: 100%; margin: 44px 0 0 0;}
.sticky-createnew { padding: 0 10px; position: absolute; top:0; left:0; width: 100%; height: 44px;}
.sticky-createnew .menu-v { margin-top: 0; }
.sticky-createnew .menu-v a { padding-top: 15px; padding-bottom: 15px; background:rgba(255, 249, 207, 0.25);
.sticky-createnew .menu-v a { padding-top: 15px; padding-bottom: 15px; background:rgba(255, 249, 207, 0.25);
filter: progid:DXImageTransform.Microsoft.gradient(GradientType=0,startColorstr='#65fff9cf', endColorstr='#65fff9cf'); color: #fff; }
.sticky-createnew .menu-v a:hover { background:rgba(255, 249, 207, 0.25); }

Expand Down Expand Up @@ -110,7 +110,7 @@ ul.thumbs a:hover { border: solid 1px #fff; }

div.sticky { position:absolute; -webkit-box-sizing: border-box; -moz-box-sizing: border-box; box-sizing: border-box; z-index:1; width:155px; height:172px; }
ul.thumbs li { min-width:inherit; }
div.sticky-inner { padding:0px; background:#fef49c; border:solid 1px #bca902; margin:10px; -moz-box-shadow:3px 3px 10px rgba(0, 0, 0, 0.5); -webkit-box-shadow:3px 3px 10px rgba(0, 0, 0, 0.5); box-shadow:3px 3px 10px rgba(0, 0, 0, 0.5); position:relative; margin:0; }
div.sticky-inner { padding:0; background:#fef49c; border:solid 1px #bca902; margin:10px; -moz-box-shadow:3px 3px 10px rgba(0, 0, 0, 0.5); -webkit-box-shadow:3px 3px 10px rgba(0, 0, 0, 0.5); box-shadow:3px 3px 10px rgba(0, 0, 0, 0.5); position:relative; margin:0; }
div.sticky-inner.active { cursor:pointer; margin:-1px 0 0 -1px; -moz-box-shadow:3px 3px 16px rgba(0, 0, 0, 0.7); -webkit-box-shadow:3px 3px 16px rgba(0, 0, 0, 0.7); box-shadow:3px 3px 16px rgba(0, 0, 0, 0.7); }
.sticky-inner:hover .sticky-header { display: block; }
.sticky-header { background:#feea3d; border:1px solid #bca902; font-size:0.7em; margin:-17px -1px 0 -1px; height:13px; padding: 1px 0; opacity: 0.8; }
Expand All @@ -137,7 +137,7 @@ i.sticky { background:#FEF49C }

#wa ::-webkit-scrollbar { width:10px; height:10px; }
#wa ::-webkit-scrollbar-button:start:decrement, #doc ::-webkit-scrollbar-button:end:increment { display:block; height:0; background-color:transparent; }
#wa ::-webkit-scrollbar-track-piece { background-color:rgba(255, 240, 220, 0.95) background-image:url(../img/scroll.png); background-position: center center; -webkit-border-radius:0; -webkit-border-bottom-right-radius:10px; -webkit-border-bottom-left-radius:10px; }
#wa ::-webkit-scrollbar-track-piece { background-color:rgba(255, 240, 220, 0.95); background-image:url("../img/scroll.png"); background-position: center center; -webkit-border-radius:0; -webkit-border-bottom-right-radius:10px; -webkit-border-bottom-left-radius:10px; }
#wa ::-webkit-scrollbar-thumb:vertical { height:50px; background-color:rgba(255, 240, 220, 0.75); -webkit-border-radius:10px; }
#wa ::-webkit-scrollbar-thumb:horizontal { width:50px; background-color:rgba(255, 240, 220, 0.75); -webkit-border-radius:10px; }

Expand Down
Binary file modified wa-apps/stickies/img/noisyblue.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified wa-apps/stickies/img/noisygreen.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?php
/**
*
* @author WebAsyst Team
* @author Webasyst
*
*/

Expand Down
2 changes: 1 addition & 1 deletion wa-apps/stickies/lib/actions/stickiesBackend.action.php
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?php
/**
*
* @author WebAsyst Team
* @author Webasyst
* @package Stickies
*
*/
Expand Down
2 changes: 1 addition & 1 deletion wa-apps/stickies/lib/config/app.php
Original file line number Diff line number Diff line change
Expand Up @@ -11,4 +11,4 @@
'version' => '1.1.0',
'critical'=>'1.1.0',
'vendor' => 'webasyst',
);
);
36 changes: 27 additions & 9 deletions wa-apps/stickies/lib/config/logs.php
Original file line number Diff line number Diff line change
@@ -1,13 +1,31 @@
<?php

return array(
'board_add' => array(),
'board_edit' => array(),
'board_delete' => array(),
'sticky_add' => array(),
'sticky_edit' => array(),
'sticky_resize' => array(),
'sticky_move_to_board' => array(),
'sticky_delete' => array(),
'sticky_move' => array(),
'board_add' => array(
'name' => /*_w*/('created a new board')
),
'board_edit' => array(
'name' => /*_w*/('edited board')
),
'board_delete' => array(
'name' => /*_w*/('deleted board')
),
'sticky_add' => array(
'name' => /*_w*/('added a new sticky')
),
'sticky_edit' => array(
'name' => /*_w*/('edited sticky')
),
'sticky_resize' => array(
'name' => /*_w*/('resized sticky')
),
'sticky_move_to_board' => array(
'name' => /*_w*/('moved sticky to another board')
),
'sticky_delete' => array(
'name' => /*_w*/('deleted sticky')
),
'sticky_move' => array(
'name' => /*_w*/('moved sticky')
),
);
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?php
/**
*
* @author WebAsyst Team
* @author Webasyst
*
*/

Expand Down
2 changes: 1 addition & 1 deletion wa-apps/stickies/lib/models/stickiesSheet.model.php
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?php
/**
*
* @author WebAsyst Team
* @author Webasyst
* @package Stickies
*
*/
Expand Down
2 changes: 1 addition & 1 deletion wa-apps/stickies/lib/models/stickiesSticky.model.php
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?php
/**
*
* @author WebAsyst Team
* @author Webasyst
* @package Stickies
*
*/
Expand Down
Binary file modified wa-apps/stickies/locale/ru_RU/LC_MESSAGES/stickies.mo
Binary file not shown.
36 changes: 36 additions & 0 deletions wa-apps/stickies/locale/ru_RU/LC_MESSAGES/stickies.po
Original file line number Diff line number Diff line change
Expand Up @@ -148,3 +148,39 @@ msgstr ""
#: /wa-apps/stickies/lib/models/stickiesSheet.model.php:83
msgid "Board not found"
msgstr ""

#: /wa-apps/stickies/lib/config/logs.php:5
msgid "created a new board"
msgstr "создал новую доску"

#: /wa-apps/stickies/lib/config/logs.php:8
msgid "edited board"
msgstr "отредактировал доску"

#: /wa-apps/stickies/lib/config/logs.php:11
msgid "deleted board"
msgstr "удалил доску"

#: /wa-apps/stickies/lib/config/logs.php:14
msgid "added a new sticky"
msgstr "добавил новую заметку"

#: /wa-apps/stickies/lib/config/logs.php:17
msgid "edited sticky"
msgstr "отредактировал заметку"

#: /wa-apps/stickies/lib/config/logs.php:20
msgid "resized sticky"
msgstr "изменил размер заметки"

#: /wa-apps/stickies/lib/config/logs.php:23
msgid "moved sticky to another board"
msgstr "переместил заметку на другую доску"

#: /wa-apps/stickies/lib/config/logs.php:26
msgid "deleted sticky"
msgstr "удалил заметку"

#: /wa-apps/stickies/lib/config/logs.php:29
msgid "moved sticky"
msgstr "переместил заметку"
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
<!DOCTYPE html>
<html>
<head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" >
Expand All @@ -7,8 +7,6 @@
<meta name="apple-mobile-web-app-capable" content="yes">
<meta name="viewport" content="width=device-width; initial-scale=1; maximum-scale=1; user-scalable=0;">

<link rel="apple-touch-icon" href="apps/mobile/img/iphone_icon.png">

<link type="text/css" rel="stylesheet" href="{{$wa_url}}wa-content/css/wa/wa-mobile-1.0.css">
<link type="text/css" rel="stylesheet" href="{{$wa_app_static_url}}css/mobile.css">
{{wa_js file="js/wa.stickiesmobilecontroller.min.js"}}
Expand Down
6 changes: 3 additions & 3 deletions wa-apps/stickies/templates/actions/backend/Backend.html
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
<!DOCTYPE html>
<html>
<head>
<meta http-equiv="X-UA-Compatible" content="IE=8">
<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
<title>[`Stickies`] — {{$wa->accountName()}}</title>
<title>[`Stickies`] — {{$wa->accountName(false)|escape}}</title>
{{$wa->css()}}

<link type="text/css" rel="stylesheet" href="{{$wa_app_static_url}}css/stickies.css?v={{$wa->version()}}">
Expand Down Expand Up @@ -238,7 +238,7 @@ <h5>[`Color`]</h5>
translate['no name'] = '[`no name`]';
translate['Stickies'] = '[`Stickies`]';

var accountName = '{{$wa->accountName()}}';
var accountName = '{{$wa->accountName()|escape:'javascript'}}';
var default_background = '{{key($sheet_backgrounds)}}';
$(document).ready( function() {

Expand Down

0 comments on commit 62be82c

Please sign in to comment.