------------------------------------------------------------ revno: 855 committer: Steven Garcia <steven@satellite> branch nick: aikiframework timestamp: Wed 2011-06-15 19:07:53 -0700 message: Admin interface about aiki window now shows authors from AUTHORS file. fixed Bug #692497. bumped aiki fix number. modified: AUTHORS configure.ac man/man.in src/aiki.php src/configs/defs.inc src/libs/installer.php src/sql/InsertVariable-in.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
=== modified file 'AUTHORS' --- AUTHORS 2010-12-27 20:35:41 +0000 +++ AUTHORS 2011-06-16 02:07:53 +0000 @@ -1,8 +1,15 @@ # Authors of Aiki Framework +# IMPORTANT +# The authors in this file are being parsed. This file should adhere to a +# specific format. All non-blank lines NOT containing an authors name must +# lead with the comment character '#'. Authors names must start at the +# beginning of the line. Authors names may contain multiple non-consecutive +# SINGLE spaces and must be terminated by one or more consecutive DOUBLE spaces. + # The following entities contributed to the development of # Aiki Framework in some way. Please, let us know if you should -# be listed here.Thank you for your generous contributions. +# be listed here. Thank you for your generous contributions. # Name Title Bassel Safadi Lead Developer/Programmer @@ -14,22 +21,21 @@ Vera Lobatcheva Graphic Design Brad Phillips Developer/Graphic Design Steven Garcia Developer/Programmer +Roger MartÃn Developer/Programmer Fabricatorz, LLC Developers/Graphic Design AikiLab Singapore, PTE LTD Developers/Graphic Design ------ - -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/>. +# 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/>. === modified file 'configure.ac' --- configure.ac 2011-06-15 07:40:41 +0000 +++ configure.ac 2011-06-16 02:07:53 +0000 @@ -464,6 +464,11 @@ URL=[http://aikiframework.org] AC_SUBST(URL) +# Include authors substitutions +AUTHORS=$($SED '/^\#/d; /^\n*$/d; s/\ \ .\+//; s/\ \+/\ \;/g; s/$/\<br\/\>\\r\\n/g' ../AUTHORS | $TR -d '\n') +AUTHORS_TITLES=$($SED '/^\#/d; /^\n*$/d; s/$/\\n/g; s/\ /\\\ /g; s/\//\\\//g' ../AUTHORS | $TR -d '\n') +AC_SUBST(AUTHORS,$AUTHORS) + # list standard directories VAR_LIST_ADD prefix $prefix VAR_LIST_ADD docdir $docdir @@ -591,3 +596,7 @@ # print a summary of the enabled features, packages and requirements PRINT_CONFIG_SUMMARY + +# substitute the authors and title from the AUTHORS file into the man page +$SED "s/@AUTHORS_TITLES@/$AUTHORS_TITLES/" man/aiki.1 > man/aiki.tmp \ +&& $MV man/aiki.tmp man/aiki.1 === modified file 'man/man.in' --- man/man.in 2011-06-05 07:35:00 +0000 +++ man/man.in 2011-06-16 02:07:53 +0000 @@ -86,17 +86,7 @@ .SH "AUTHORS" .RS 0 .nf -Bassel Safadi Lead Developer/Programmer -Jon Phillips Project Manager/Developer -Christopher Adams Developer -Barry Threw Developer -Michi Krnac Developer -Ronaldo Barbachano Developer -Vera Lobatcheva Graphic Design -Brad Phillips Developer/Graphic Design -Steven Garcia Developer/Programmer -Fabricatorz, LLC Developers/Graphic Design -AikiLab Singapore, PTE LTD Developers/Graphic Design +@AUTHORS_TITLES@ .SH "REPORTING BUGS" Report bugs to: @PACKAGE_BUGREPORT@ === modified file 'src/aiki.php' --- src/aiki.php 2011-06-15 07:40:41 +0000 +++ src/aiki.php 2011-06-16 02:07:53 +0000 @@ -25,7 +25,7 @@ * When the MAJOR number changes, the MINOR number should reset to zero. * When the MAJOR number is zero, this indicates an alpha or beta type * release. Each number can, but should probably not exceed 99 */ -define('AIKI_VERSION','0.8.21'); +define('AIKI_VERSION','0.8.22'); /** * Used to test for script access === modified file 'src/configs/defs.inc' --- src/configs/defs.inc 2011-06-14 21:09:57 +0000 +++ src/configs/defs.inc 2011-06-16 02:07:53 +0000 @@ -34,9 +34,14 @@ require_once("$AIKI_ROOT_DIR/configs/aiki-defs.php"); } +// **** Begin Automake generated constants **** // + /** Aiki Framework Revision */ define("AIKI_REVISION", "@REVISION@"); +/** Aiki Authors */ +define("AIKI_AUTHORS", '@AUTHORS@'); + /** Aiki Log Directory */ define("AIKI_LOG_DIR", "@AIKI_LOG_DIR@"); === modified file 'src/libs/installer.php' --- src/libs/installer.php 2011-06-15 02:54:01 +0000 +++ src/libs/installer.php 2011-06-16 02:07:53 +0000 @@ -325,6 +325,7 @@ $sql_insert_variable = str_replace("@ADMIN_MAIL@",$email,$sql_insert_variable); $sql_insert_variable = str_replace("@VERSION@",AIKI_VERSION,$sql_insert_variable); $sql_insert_variable = str_replace("@REVISION@",AIKI_REVISION,$sql_insert_variable); + $sql_insert_variable = str_replace("@AUTHORS@",AIKI_AUTHORS,$sql_insert_variable); /* In MySQL, the â-- â (double-dash) comment style requires the second * dash to be followed by at least one whitespace or control character. === modified file 'src/sql/InsertVariable-in.sql' --- src/sql/InsertVariable-in.sql 2011-06-14 22:04:14 +0000 +++ src/sql/InsertVariable-in.sql 2011-06-16 02:07:53 +0000 @@ -41,7 +41,7 @@ -- ------------------------------------------------------ INSERT IGNORE INTO `aiki_widgets` (`id`, `app_id`, `widget_name`, `widget_site`, `widget_target`, `widget_type`, `display_order`, `style_id`, `is_father`, `father_widget`, `display_urls`, `kill_urls`, `normal_select`, `authorized_select`, `if_no_results`, `widget`, `css`, `nogui_widget`, `display_in_row_of`, `records_in_page`, `link_example`, `pagetitle`, `is_admin`, `if_authorized`, `permissions`, `remove_container`, `widget_cache_timeout`, `custom_output`, `custom_header`, `is_active`, `widget_owner`, `widget_privilege`) VALUES -(1, 1, 'header', 'default', 'body', 'div', 1, '', '0', 6, 'admin', '', '', '', '', '(#(header:Location: [root]/login|false|301)#)', '#header {\r\n height: 28px;\r\n background: #eeeeee;\r\n position: relative;\r\n border-bottom:1px solid #666666;\r\n border-top:1px solid #666666;\r\n text-align:center;\r\n}\r\n\r\n#main-navigation {\r\n position: relative;\r\n float:left;\r\n line-height:25px;\r\n}\r\n\r\n#main-navigation li{\r\n float:left;\r\n line-height:25px;\r\n margin-right: 10px;\r\n margin-left: 10px;\r\n}\r\n\r\n#main-navigation li a img{\r\n margin-top:5px;\r\n}\r\n\r\n#main-navigation .aiki-icon {\r\n margin-left:-5px;\r\n margin-right:-10px;\r\n}\r\n\r\n#main-navigation a.active{\r\n font-weight:bold;\r\n}\r\n\r\n#user-navigation {\r\n position: relative;\r\n float:right;\r\n line-height:25px;\r\n}\r\n\r\n#user-navigation li{\r\n float:left;\r\n line-height:25px;\r\n \r\n}\r\n\r\n#user-navigation li a, #user-navigation li strong{\r\n margin-right: 10px;\r\n margin-left: 10px;\r\n}\r\n\r\n#user-navigation li a img{\r\n margin-top:5px;\r\n}\r\n\r\n#user-navigation .aiki-icon {\r\n margin-left:-5px;\r\n margin-right:-10px;\r\n}\r\n\r\n#user-navigation a.active{\r\n font-weight:bold;\r\n}\r\n\r\n#tree-menu {\r\n border-bottom: 1px dashed #d3d7cf;\r\ndisplay:block;\r\nposition:relative;\r\n}\r\n\r\n#tree-menu li{\r\n float:left;\r\n line-height:25px;\r\n \r\n}\r\n\r\n#tree-menu li a{\r\n margin-right: 5px;\r\n margin-left: 5px;\r\n}\r\n\r\n#tree-menu li a img{\r\n margin-top:5px;\r\n height:12px;\r\n margin-right:2px;\r\n}\r\n\r\n#widget-tree {\r\n text-align:left;\r\n}', '', 0, 0, '', 'aiki AdminPanel', 1, " <ul id='main-navigation' class='clearfix'>\r\n <li><a href='#' class='aiki-icon' id='aiki-icon-button'><img src='[root]/assets/apps/admin/images/aiki-icon.png' /></a></li>\r\n <li><a href='#' id='structur_button'>Structure</a></li>\r\n<li><a href='#' id='system_button'>System</a></li>\r\n </ul>\r\n\r\n(ajax_a(structur_button;\r\n['[root]/index.php?widget=structur_accordion','#ui-layout-west', 'structur_accordion()']\r\n)ajax_a)\r\n\r\n(ajax_a(system_button;\r\n['[root]/index.php?widget=system_accordion','#ui-layout-west', 'system_accordion()']\r\n)ajax_a)\r\n\r\n <ul id='user-navigation' class='clearfix'>\r\n <li><a rev='#widget-form' href='[root]/admin_tools/edit/17/[userid]' rel='edit_record'>[username]</a> @ <a href='[root]'>[root]</a>| </li> \r\n <li><a href='http://www.aikiframework.org/'>aiki framework @VERSION@.@REVISION@</a>|</li> \r\n <li><a href='[root]/admin_tools/logout'>Logout</a></li>\r\n </ul>\r\n\r\n<div id='dialog' title='About Aikiframework'>\r\n <p>\r\n <img src='[root]/assets/apps/admin/images/logo.png' />\r\n <br /><br />\r\n <h2>aiki framework @VERSION@.@REVISION@</h2>\r\n <br />\r\n <a href='http://www.aikiframework.org'>http://www.aikiframework.org</a>\r\n <br /><br />\r\n <h2>Credits:</h2> \r\n Bassel Safadi<br />\r\n Jon Phillips<br />\r\n Christopher Adams<br />\r\n Barry Threw<br />\r\n Michi Krnac<br />\r\n Ronaldo Barbachano <br />\r\n Brad Phillips<br />\r\n Steven Garcia <br />\r\n Roger MartÃn <br />\r\n Vera Lobatcheva<br />\r\n Fabricatorz, LLC<br />\r\n AikiLab Singapore<br />\r\n</p>\r\n</div>", 'SystemGOD', 0, 0, 0, '', 1, 2, 'w'), +(1, 1, 'header', 'default', 'body', 'div', 1, '', '0', 6, 'admin', '', '', '', '', '(#(header:Location: [root]/login|false|301)#)', '#header {\r\n height: 28px;\r\n background: #eeeeee;\r\n position: relative;\r\n border-bottom:1px solid #666666;\r\n border-top:1px solid #666666;\r\n text-align:center;\r\n}\r\n\r\n#main-navigation {\r\n position: relative;\r\n float:left;\r\n line-height:25px;\r\n}\r\n\r\n#main-navigation li{\r\n float:left;\r\n line-height:25px;\r\n margin-right: 10px;\r\n margin-left: 10px;\r\n}\r\n\r\n#main-navigation li a img{\r\n margin-top:5px;\r\n}\r\n\r\n#main-navigation .aiki-icon {\r\n margin-left:-5px;\r\n margin-right:-10px;\r\n}\r\n\r\n#main-navigation a.active{\r\n font-weight:bold;\r\n}\r\n\r\n#user-navigation {\r\n position: relative;\r\n float:right;\r\n line-height:25px;\r\n}\r\n\r\n#user-navigation li{\r\n float:left;\r\n line-height:25px;\r\n \r\n}\r\n\r\n#user-navigation li a, #user-navigation li strong{\r\n margin-right: 10px;\r\n margin-left: 10px;\r\n}\r\n\r\n#user-navigation li a img{\r\n margin-top:5px;\r\n}\r\n\r\n#user-navigation .aiki-icon {\r\n margin-left:-5px;\r\n margin-right:-10px;\r\n}\r\n\r\n#user-navigation a.active{\r\n font-weight:bold;\r\n}\r\n\r\n#tree-menu {\r\n border-bottom: 1px dashed #d3d7cf;\r\ndisplay:block;\r\nposition:relative;\r\n}\r\n\r\n#tree-menu li{\r\n float:left;\r\n line-height:25px;\r\n \r\n}\r\n\r\n#tree-menu li a{\r\n margin-right: 5px;\r\n margin-left: 5px;\r\n}\r\n\r\n#tree-menu li a img{\r\n margin-top:5px;\r\n height:12px;\r\n margin-right:2px;\r\n}\r\n\r\n#widget-tree {\r\n text-align:left;\r\n}', '', 0, 0, '', 'aiki AdminPanel', 1, " <ul id='main-navigation' class='clearfix'>\r\n <li><a href='#' class='aiki-icon' id='aiki-icon-button'><img src='[root]/assets/apps/admin/images/aiki-icon.png' /></a></li>\r\n <li><a href='#' id='structur_button'>Structure</a></li>\r\n<li><a href='#' id='system_button'>System</a></li>\r\n </ul>\r\n\r\n(ajax_a(structur_button;\r\n['[root]/index.php?widget=structur_accordion','#ui-layout-west', 'structur_accordion()']\r\n)ajax_a)\r\n\r\n(ajax_a(system_button;\r\n['[root]/index.php?widget=system_accordion','#ui-layout-west', 'system_accordion()']\r\n)ajax_a)\r\n\r\n <ul id='user-navigation' class='clearfix'>\r\n <li><a rev='#widget-form' href='[root]/admin_tools/edit/17/[userid]' rel='edit_record'>[username]</a> @ <a href='[root]'>[root]</a>| </li> \r\n <li><a href='http://www.aikiframework.org/'>aiki framework @VERSION@.@REVISION@</a>|</li>\r\n<li><a href='[root]/admin_tools/logout'>Logout</a></li>\r\n</ul>\r\n\r\n<div id='dialog' title='About Aikiframework'>\r\n<p>\r\n<img src='[root]/assets/apps/admin/images/logo.png' />\r\n<br /><br />\r\n<h2>Aiki Framework @VERSION@.@REVISION@</h2>\r\n<br />\r\n<a href='http://www.aikiframework.org'>http://www.aikiframework.org</a>\r\n<br /><br />\r\n<h2>Credits:</h2>\r\n@AUTHORS@</p>\r\n</div>", 'SystemGOD', 0, 0, 0, '', 1, 2, 'w'), (2, 1, 'terminal', 'default', 'body', 'div', 2, '', 0, 6, 'admin', '', '', '', '', '', '#terminal {\r\n height: 300px;\r\n left: 1px;\r\n overflow: auto;\r\n position: absolute;\r\n width: 100%;\r\n}\r\n#terminal p{\r\npadding: 2px;\r\n}', '', 0, 0, '', '', 1, '', 'SystemGOD', 0, 0, 0, '', 1, 2, 'w'), (3, 1, 'structur_accordion', 'default', 'body', 'div', 6, '', '0', 7, 'admin', '', '', '', '', '', '', '', 0, 0, '', '', 1, '<h3><a href="#" id="urls_widgets">Urls & Widgets</a></h3>\r\n<div>\r\n <ul id="tree-menu" class="clearfix">\r\n <li><a href="#" id="create_new_widget"><img src="[root]/assets/apps/admin/images/icons/layout_add.png" />Create Widget</a></li>\r\n </ul>\r\n <div id="widgettree" class="demo"></div>\r\n</div>\r\n\r\n<h3><a href="#" id="database_forms">Databases & Forms</a></h3>\r\n<div>\r\n <ul id="tree-menu" class="clearfix">\r\n <li><a href="#" id="create_new_table"><img src="[root]/assets/apps/admin/images/icons/database.png" />Create Table</a></li>\r\n <li><a href="#" id="create_new_form"><img src="[root]/assets/apps/admin/images/icons/application_form.png" />Create Form</a></li>\r\n </ul>\r\n<div id="databaseformstree" class="demo"></div>\r\n</div>\r\n', 'SystemGOD', 0, 0, 0, '', 1, 2, 'w'), (4, 1, 'widget_accordion', 'default', 'body', 'div', 0, '', '', 8, 'admin', '', '', '', '', '', '#breadcrumbs li{\r\n float:left; \r\n}\r\n\r\n#breadcrumbs li a{\r\n float:left;\r\n}\r\n\r\n#breadcrumbs li a img{\r\n height:12px;\r\n margin-right:4px;\r\n top: 5px;\r\n}\r\n\r\n#breadcrumbs li img{\r\n float:left;\r\n position: relative; \r\n top: 8px;\r\n margin-left:10px;\r\n}\r\n\r\n.codetext {\r\n margin:0 15px 0 15px;\r\n color:#555753;\r\n font-size:80%;\r\n}\r\n\r\n.options-button {\r\n background:#eeeeee;\r\n margin:15px 15px 0 15px;\r\n width:80px;\r\n height:20px;\r\n text-align:center;\r\n}\r\n\r\n.options-button a{\r\n margin:5px;\r\n color: #1b3b6b;\r\n}\r\n.options-button a:hover {\r\n text-decoration: none;\r\n}\r\n\r\n.options {\r\n border:1px solid #eeeeee;\r\n margin:0px 15px 0 15px;\r\n padding:10px;\r\n color: #1b3b6b;\r\n}\r\n#big_form {\r\n margin:0px 15px 0 15px;\r\n}\r\ntextarea, input, select {\r\n border:2px solid #c3c3c3;\r\n font-family: "Courier New";\r\n padding:3px;\r\n color:#555753;\r\n margin:0 15px 0 15px;\r\n font-size:120%;\r\n background:GhostWhite ;\r\n}\r\n\r\nfieldset {\r\n border: 0;\r\n}\r\n\r\n.buttons {\r\n text-align:right;\r\n}\r\n\r\n#widget_container, #authorized_select_container, #normal_select_container, #css_container, #if_authorized_container{\r\nborder: 1px solid black;\r\npadding: 3px;\r\nbackground-color: #F8F8F8\r\n}\r\n\r\n#widget-form label{\r\nborder-color:#CCCCCC;\r\nborder-style:dotted none;\r\nborder-width:1px 0 0;\r\ndisplay:block;\r\nmargin-top:16px;\r\npadding-bottom:6px;\r\npadding-top:4px;\r\nfont-weight: bold;}', '', 0, 0, '', '', 1, '<h3><a></a></h3>\r\n\r\n<div id="widget-form" class="accordion-content">\r\nYou can start building your CMS from the left menu.\r\n</div>', 'SystemGOD', 0, 0, 0, '', 1, 2, 'w'),
_______________________________________________ Mailing list: https://launchpad.net/~aikiframework-devel Post to : [email protected] Unsubscribe : https://launchpad.net/~aikiframework-devel More help : https://help.launchpad.net/ListHelp
