------------------------------------------------------------ revno: 1081 committer: Roger Martin <[email protected]> branch nick: aikiframework timestamp: Mon 2012-02-06 23:18:41 +0100 message: login use default theme added: assets/themes/default/images/aiki_framework.png assets/themes/default/login.css modified: sql/InsertDefaults.sql sql/UpdateDefaults.sql
-- lp:aikiframework https://code.launchpad.net/~aikiframework-devel/aikiframework/trunk Your team Aiki Framework Developers is subscribed to branch lp:aikiframework. To unsubscribe from this branch go to https://code.launchpad.net/~aikiframework-devel/aikiframework/trunk/+edit-subscription
=== added file 'assets/themes/default/images/aiki_framework.png' Binary files assets/themes/default/images/aiki_framework.png 1970-01-01 00:00:00 +0000 and assets/themes/default/images/aiki_framework.png 2012-02-06 22:18:41 +0000 differ === added file 'assets/themes/default/login.css' --- assets/themes/default/login.css 1970-01-01 00:00:00 +0000 +++ assets/themes/default/login.css 2012-02-06 22:18:41 +0000 @@ -0,0 +1,140 @@ +/** + * Aiki Framework (PHP) + * + * @author Roger Martin + * @copyright (c) 2008-2011 Aiki Lab Pte Ltd + * @license http://www.fsf.org/licensing/licenses/agpl-3.0.html + * @link http://www.aikiframework.org + * @category Aiki + * @package apps + * + */ + +* { + margin: 0; + padding: 0;} + +body { + background: #444 url(./images/installer_bg.png) repeat-x top left; + font: normal normal normal 14px/18px sans-serif ; + } + +select, +input { + font: normal normal normal 14px/18px sans-serif ; + +} + + +#aikiadmin_login { + margin: 40px auto; + width: 600px; + background: #fff url(./images/page_bg.png) 6px 3px no-repeat; + color: #333; + padding: 18px 24px; + border-radius: 12px ; + box-shadow: 12px 12px 12px #000;} + +h1 { + color: #111; + font-size: 18px; + line-height:24px; + background: url(./images/aiki_framework.png) no-repeat top left; + padding: 55px 100px 9px 120px; } + + +h1 em { + display: block; + font-style: normal; + color: #72cccf; + text-transform: lxowercase; +} + +form { + margin: 0 90px 0 120px; + border-top:1px dotted #aaa; + border-bottom:1px dotted #aaa; +} + + +h1 strong { text-transform: uppercase } + + +span.error { + color: #a40000; +} + + +label { + font-size:18px; + line-height:24px; + color: #333; + display: block; + margin: 18px 0px 0px 0px;; +} + +div.message-error { + padding: 13px 18px 13px 50px; + position:relative; + left:-50px; + margin: 9px 0px; + color: #900; + background: #fff url(./images/error.png) no-repeat 8px 6px; } + +input.button, +.user-input { +display:block; + border: 1px solid #777; + padding: 5px 4px 2px 4px; + border-radius: 4px ; + box-shadow: 4px 4px 2px #f0f0f0; + background-color:#fff; + color: #333; +} + +.user-input { + width: 215px; +} + +input#captcha { +width: 5em ; +margin:7px; +float:left;} + +img.captcha { +display:block; +float:left; +clear:left; +margin:4px 8px 4px 0px;; +padding: 3px; +border: 1px solid #777;} + +input.button { + display:block;} + +.user-input:focus { +border-color: #f57900} + +input.button { +padding: 5px 12px 2px 12px; +background-color: #f2f2f2; +text-decoration: none; +width:94px; +margin: 12px auto 24px 132px; +} + +a.button:hover, +input.button:hover { + background-color: #ddd; +} + +#footer { +font-size:11px; +clear: both; +padding: 12px 12px 12px 120px;; +text-align:left } + +#footer a { padding-left: 6px } + + + === modified file 'sql/InsertDefaults.sql' --- sql/InsertDefaults.sql 2012-02-01 22:40:03 +0000 +++ sql/InsertDefaults.sql 2012-02-06 22:18:41 +0000 @@ -173,7 +173,7 @@ (6, 1, 'ui-layout-north', 'default', 'body', 'div', 0, 'ui-layout-north', '1', 0, 'admin', '', '', '', '', '', '.ui-layout-pane-north {\r\n/* OVERRIDE "default styles" */\r\npadding: 0 !important;\r\noverflow: hidden !important;\r\n}', '', 0, 0, '', '', 1, '', 'SystemGOD', 0, 0, 0, '', 1, 2, 'w'), (7, 1, 'ui-layout-west', 'default', 'body', 'div', 3, 'ui-layout-west', '1', 0, 'admin', '', '', '', '', '', ' .ui-layout-pane-west {\r\n padding: 0 !important;\r\n overflow: hidden !important;\r\n }', '', 0, 0, '', '', 1, '', 'SystemGOD', 0, 0, 0, '', 1, 2, 'w'), (8, 1, 'ui-layout-center', 'default', 'body', 'div', 0, 'ui-layout-center', '1', 0, 'admin', '', '', '', '', '', ' .ui-layout-pane-center {\r\n padding: 0 !important;\r\n overflow: hidden !important;\r\n }', '', 0, 0, '', '', 1, '', 'SystemGOD', 0, 0, 0, '', 1, 2, 'w'), -(9, 0, 'aikiadmin_login', 'default', 'body', 'div', 0, '', '0', 0, 'login', '', '', '', '', '<script type="text/javascript" >$(function(){$("#username").focus();});</script><h2>Sign in to Aiki Framework Admin-Panel</h2><br/><br/>\r\n<img src="[root]assets/apps/admin/images/logo.png" alt="Logo" /><br /><br />\r\n<form method="post">\r\n<div><table>\r\n <tbody>\r\n <tr>\r\n <td>Name:</td>\r\n <td><input type="text" name="username" id="username"></td>\r\n </tr>\r\n <tr>\r\n <td>Password:</td>\r\n <td><input type="password" name="password" id="password"></td>\r\n </tr>\r\n <tr>\r\n <td><input type="hidden" name="process" value="login"></td>\r\n <td><input class="button" type="submit" name="submit" value="Sign in"></td>\r\n </tr>\r\n </tbody>\r\n</table>\r\n</div>\r\n</form> \r\n\r\n<br/><br/>\r\n\r\nAiki Framework is licensed under the GNU AGPL 3.0.<br /><a href="http://www.fsf.org/licensing/licenses/agpl-3.0.html";><img src="[root]/assets/images/agpl.png" alt="AGPL"/></a>', '#aikiadmin_login {\r\n border:1px solid #c3c3c3;\r\n width:450px;\r\nmargin: auto;\r\ntext-align:center;\r\nbackground:GhostWhite ;\r\npadding:30px;\r\nposition: absolute;\r\ntop: 0;\r\nleft: 0;\r\nright: 0;\r\nbottom: 0;\r\nheight: 395px;\r\n}\r\n\r\n#aikiadmin_login img{\r\nmargin:5px;\r\n}\r\n\r\n#aikiadmin_login div{\r\nwidth: 260px; \r\nmargin: 0 auto;\r\n}\r\n\r\n#aikiadmin_login table{\r\ntext-align:right;\r\nwidth: 100%;\r\n}', '', 0, 0, '', 'Login to Aiki-Admin Panel', 1, '(#(header:Location: [root]/admin|false|301)#)', 'SystemGOD', 0, 0, 0, '', 1, 2, 'w'), +(9, 0, 'aikiadmin_login', 'default', 'body', 'div', 0, '', 0, 0, 'login', '', '', '', '', '<script type="text/javascript" >$(function(){$("#username").focus();});</script>\r\n\r\n<h1>Sign in to <em>Aiki Framework Admin-Panel</em></h1>\r\n\r\n<form method="post">\r\n(script($aiki->message->get_login_error())script)\r\n\r\n\r\n<p><label for="username">Name</label>\r\n<input type="text" name="username" id="username" class=''user-input''>\r\n\r\n<p><label for="password">Password</label>\r\n<input type="password" name="password" id="password" class=''user-input''>\r\n\r\n<input type="hidden" name="process" value="login">\r\n\r\n<p><input class="button" type="submit" name="submit" value="Sign in">\r\n</form> \r\n\r\n<div id="footer">\r\nAiki Framework is licensed under the GNU AGPL 3.0.<a href="http://www.fsf.org/licensing/licenses/agpl-3.0.html";><img src="[root]/assets/images/agpl.png" alt="AGPL"/></a>\r\n</div>', '', '', 0, 0, '', 'Login to Aiki-Admin Panel', 1, '(#(header:Location: [root]/admin|false|301)#)', 'SystemGOD', 0, 0, 0, '', 1, 2, 'w'), (10, 1, 'system_accordion', 'default', 'body', 'div', 6, '', '0', 0, '', '', '', '', '', '', '', '', 0, 0, '', '', 1, '<h3><a href="#" id="config">Config</a></h3>\r\n\r\n<div id="configtree" class="demo"></div>', 'SystemGOD', 0, 0, 0, '', 1, 2, 'w'), (11, 1, 'new_record', 'default', 'body', 'div', 0, '', '0', 0, 'admin_tools/new/(.*)', '', '', '', '', '', '', '', 0, 0, '', '', 1, '(#(form:add:(!(2)!))#)', 'SystemGOD', 0, 0, 1, '', 1, 2, 'w'), (12, 1, 'confirmations', 'default', 'body', 'div', 0, '', '', 0, 'admin', '', '', '', '', '<div id="deletewidgetdialog" title="Delete widget">\r\n <p><span class="ui-icon ui-icon-alert" style="float:left; margin:0 7px 20px 0;"></span>This widget will be permanently deleted and cannot be recovered. Are you sure?</p>\r\n</div>\r\n\r\n<div id="deleteformdialog" title="Delete Form">\r\n <p><span class="ui-icon ui-icon-alert" style="float:left; margin:0 7px 20px 0;"></span>This form will be permanently deleted and cannot be recovered. Are you sure?</p>\r\n</div>', '', '', 0, 0, '', '', 0, '', '', 0, 0, 0, '', 1, 2, 'w'), @@ -193,4 +193,5 @@ (26, 1, 'table_datagrid', 'default', 'body', 'div', 0, '', 0, 0, 'admin_tools/datagrid/(.*)', '', '', '', '', '', '', '', 0, 0, '', '', 1, '<php $aiki->Bot->DataGrid( (!(2)!) ); php>', 'SystemGOD', 0, 0, 1, '', 1, 2, 'w'), (27, 1, 'new_record_from_tablename', 'default', 'body', 'div', 0, '', 0, 0, 'admin_tools/newfromtable/(.*)', '', '', 'select id from aiki_forms where form_table like ''(!(2)!)''', '', '', '', '', 0, 0, '', '', 1, '(#(form:add:((id)):ajax)#)', 'SystemGOD', 0, 0, 1, '', 1, 2, 'w'), (28, 0, 'error_404', 'default', 'body', 'div', 0, '', 0, 0, 'error_404', '', '', '', '', '<h1>404 Page Not Found</h1><p>Please visit <a href="[root]">Home page</a> so you may find what you are looking for.</p>', '', '', 0, 0, '', 'Aikiframework', 0, '', '', 0, 0, 0, '', 1, 2, 'w'), +(29, 0, 'aikiadmin_login_theme', 'default', 'header', '', 0, '', 0, 0, 'login', '', '\r\n', '', '', '<link rel=''stylesheet'' type=''text/css''\r\nhref=''[root]/assets/themes/default/login.css''>\r\n', '', '', 0, 0, '', '', 0, '', '', 0, 0, 0, '', 1, 2, 'w'), (100, 1, 'fake', 'default', 'body', 'div', 0, '', 0, 0, '', '', '', '', '', '', '', '', 0, 0, '', '', 0, '', '', 0, 0, 0, '', 0, 0, 'w'); === modified file 'sql/UpdateDefaults.sql' --- sql/UpdateDefaults.sql 2012-02-04 22:06:37 +0000 +++ sql/UpdateDefaults.sql 2012-02-06 22:18:41 +0000 @@ -1,34 +1,33 @@ --- Upgrader SQL - --- Copyright (C) 2010 Aikilab - --- This program is free software: you can redistribute it and/or modify --- it under the terms of the GNU Affero General Public License as --- published by the Free Software Foundation, either version 3 of the --- License, or (at your option) any later version. - --- This program is distributed in the hope that it will be useful, --- but WITHOUT ANY WARRANTY; without even the implied warranty of --- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the --- GNU Affero General Public License for more details. - --- You should have received a copy of the GNU Affero General Public License --- along with this program. If not, see <http://www.gnu.org/licenses/>. - --- IMPORTANT in between each pair of SQL statements there must --- exist a comment line with a precise series of dashes. - - --- Here we delete records that will be inserted by insertDefauls.sql --- to ensure overwritten of data. - --- aiki_dictionary last id is 39 --- aiki_widget 28 is last id for oficial aiki widget. --- aiki_forms id (1,4,6,9,12,13,17,18,20 are oficial --- --- - --- ------------------------------------------------------ +/* + * Upgrader SQL + * + * Copyright (C) 2010 Aikilab + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * + * IMPORTANT in between each pair of SQL statements there must + * exist a comment line with a precise series of dashes. + * + * + * Here we delete records that will be inserted by insertDefauls.sql + * to ensure overwritten of data. + +aiki_dictionary last id is 39 +aiki_widget 29 is last id for oficial aiki widget. +aiki_forms id (1,4,6,9,12,13,17,18,20 are oficial + +*/ DELETE FROM `aiki_dictionary` WHERE `term_id` < 39; @@ -38,6 +37,4 @@ -- ------------------------------------------------------ -DELETE FROM `aiki_widgets` WHERE `id` < 28; - --- ------------------------------------------------------ +DELETE FROM `aiki_widgets` WHERE `id` < 30;
_______________________________________________ Mailing list: https://launchpad.net/~aikiframework-devel Post to : [email protected] Unsubscribe : https://launchpad.net/~aikiframework-devel More help : https://help.launchpad.net/ListHelp
