Merge authors:
Christopher Adams (christopheradams)
Steven Garcia <steven@satellite>
------------------------------------------------------------
revno: 780 [merge]
committer: Roger Martin <[email protected]>
branch nick: aikiframework
timestamp: Sun 2011-06-05 21:25:07 +0200
message:
merge diverged..
added:
src/system/libraries/message.php
modified:
Makefile.am
VERSION.in
configure.ac
man/man.in
scripts/aiki.in
src/aiki.php
src/configs/aiki-defs.inc
src/system/libraries/Makefile.am
src/system/libraries/bot.php
src/system/libraries/installer.php
src/system/libraries/output.php
src/system/libraries/php.php
src/system/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 'Makefile.am'
--- Makefile.am 2011-05-26 19:21:27 +0000
+++ Makefile.am 2011-06-05 07:35:00 +0000
@@ -78,7 +78,8 @@
$(abs_top_srcdir)/build/$(distdir) \
$$($(FIND) . -name $(distdir).\*) \
$$($(FIND) . -name $(distdir)-\*) \
- $$($(FIND) . -name $(PACKAGE)-rev-\*)
+ $$($(FIND) . -name $(PACKAGE)-src-\*) \
+ $$($(FIND) . -name $(PACKAGE)-devel-\*)
# Additional files and directories to remove on distclean
distclean-local :
@@ -205,13 +206,9 @@
am__tar = ${AMTAR} chf - "$$tardir"
# previously was defined in aclocal.m4: am__tar = ${AMTAR} chof - "$$tardir"
-# get source revision number
-REVNFILE = $$($(FIND) $(srcdir) -name last-revision)
-REVISION = $$($(AWK) '{print $$1; exit}' $(REVNFILE))
-
# generate source revision packages
-all : distsum rev
-rev :
+all : distdevel src
+src :
@$(TAR) -xpzf $(distdir).tar.gz \
--exclude="*.ac" \
--exclude="*.am" \
@@ -233,43 +230,46 @@
@$(CP) -vf VERSION $(PACKAGE)/
@for d in $$($(FIND) $(PACKAGE) -type d); do $(CHMOD) 0755 $$d; done
@for f in $$($(FIND) $(PACKAGE) -type f); do $(CHMOD) 0644 $$f; done
- @$(ZIP) -rq $(PACKAGE)-$@-$(REVISION).zip $(PACKAGE)
- @$(TAR) -cpzf $(PACKAGE)-$@-$(REVISION).tar.gz $(PACKAGE)
- @$(TAR) -cpjf $(PACKAGE)-$@-$(REVISION).tar.bz2 $(PACKAGE)
+ @$(ZIP) -rq $(PACKAGE)-$@-$(VERSION).$(REVISION).zip $(PACKAGE)
+ @$(TAR) -cpzf $(PACKAGE)-$@-$(VERSION).$(REVISION).tar.gz $(PACKAGE)
+ @$(TAR) -cpjf $(PACKAGE)-$@-$(VERSION).$(REVISION).tar.bz2 $(PACKAGE)
@$(MV) $(PACKAGE) $(distdir)
# generate sum for source revision packages
- @$(SHASUM) -a $(ALGORITHM) $(PACKAGE)-$@-$(REVISION).zip > $(PACKAGE)-$@-$(REVISION).zip.shasum-$(ALGORITHM).txt
- @$(SHASUM) -a $(ALGORITHM) $(PACKAGE)-$@-$(REVISION).tar.gz > $(PACKAGE)-$@-$(REVISION).tar.gz.shasum-$(ALGORITHM).txt
- @$(SHASUM) -a $(ALGORITHM) $(PACKAGE)-$@-$(REVISION).tar.bz2 > $(PACKAGE)-$@-$(REVISION).tar.bz2.shasum-$(ALGORITHM).txt
+ @$(SHASUM) -a $(ALGORITHM) $(PACKAGE)-$@-$(VERSION).$(REVISION).zip > $(PACKAGE)-$@-$(VERSION).$(REVISION).zip.shasum-$(ALGORITHM).txt
+ @$(SHASUM) -a $(ALGORITHM) $(PACKAGE)-$@-$(VERSION).$(REVISION).tar.gz > $(PACKAGE)-$@-$(VERSION).$(REVISION).tar.gz.shasum-$(ALGORITHM).txt
+ @$(SHASUM) -a $(ALGORITHM) $(PACKAGE)-$@-$(VERSION).$(REVISION).tar.bz2 > $(PACKAGE)-$@-$(VERSION).$(REVISION).tar.bz2.shasum-$(ALGORITHM).txt
if ENABLE_SIGS
- @$(GPG) --batch --yes -qb $(PACKAGE)-$@-$(REVISION).zip
- @$(GPG) --batch --yes -qb $(PACKAGE)-$@-$(REVISION).tar.gz
- @$(GPG) --batch --yes -qb $(PACKAGE)-$@-$(REVISION).tar.bz2
+ @$(GPG) --batch --yes -qb $(PACKAGE)-$@-$(VERSION).$(REVISION).zip
+ @$(GPG) --batch --yes -qb $(PACKAGE)-$@-$(VERSION).$(REVISION).tar.gz
+ @$(GPG) --batch --yes -qb $(PACKAGE)-$@-$(VERSION).$(REVISION).tar.bz2
endif
- @for f in $$($(FIND) . -name $(PACKAGE)-$@-$(REVISION).\*); do $(CHMOD) 0644 $$f; done
+ @for f in $$($(FIND) . -name $(PACKAGE)-$@-$(VERSION).$(REVISION).\*); do $(CHMOD) 0644 $$f; done
@$(ECHO) "*****************************************************************"
@$(ECHO) "$(PACKAGE) revision $(REVISION) archives ready for distribution:"
- @$(LS) -1 $(PACKAGE)-$@-$(REVISION).*
+ @$(LS) -1 $(PACKAGE)-$@-$(VERSION).$(REVISION).*
@$(ECHO) "*****************************************************************"
-# to check: shasum -a 256 -c aiki-rev-429.tar.gz.shasum-256.txt
+# to check: shasum -a 256 -c aiki-src-429.tar.gz.shasum-256.txt
-# generate sum for distribution packages
-distsum : dist summod
-distchecksum : distcheck summod
-summod :
- @$(SHASUM) -a $(ALGORITHM) $(distdir).zip > $(distdir).zip.shasum-$(ALGORITHM).txt
- @$(SHASUM) -a $(ALGORITHM) $(distdir).tar.gz > $(distdir).tar.gz.shasum-$(ALGORITHM).txt
- @$(SHASUM) -a $(ALGORITHM) $(distdir).tar.bz2 > $(distdir).tar.bz2.shasum-$(ALGORITHM).txt
+# generate sum for development distribution packages
+distdevel : dist devel
+distcheckdevel : distcheck devel
+devel :
+ @$(CP) -a $(distdir).zip $(PACKAGE)-$@-$(VERSION).$(REVISION).zip
+ @$(CP) -a $(distdir).tar.gz $(PACKAGE)-$@-$(VERSION).$(REVISION).tar.gz
+ @$(CP) -a $(distdir).tar.bz2 $(PACKAGE)-$@-$(VERSION).$(REVISION).tar.bz2
+ @$(SHASUM) -a $(ALGORITHM) $(PACKAGE)-$@-$(VERSION).$(REVISION).zip > $(PACKAGE)-$@-$(VERSION).$(REVISION).zip.shasum-$(ALGORITHM).txt
+ @$(SHASUM) -a $(ALGORITHM) $(PACKAGE)-$@-$(VERSION).$(REVISION).tar.gz > $(PACKAGE)-$@-$(VERSION).$(REVISION).tar.gz.shasum-$(ALGORITHM).txt
+ @$(SHASUM) -a $(ALGORITHM) $(PACKAGE)-$@-$(VERSION).$(REVISION).tar.bz2 > $(PACKAGE)-$@-$(VERSION).$(REVISION).tar.bz2.shasum-$(ALGORITHM).txt
if ENABLE_SIGS
- @$(GPG) --batch --yes -qb $(distdir).zip
- @$(GPG) --batch --yes -qb $(distdir).tar.gz
- @$(GPG) --batch --yes -qb $(distdir).tar.bz2
+ @$(GPG) --batch --yes -qb $(PACKAGE)-$@-$(VERSION).$(REVISION).zip
+ @$(GPG) --batch --yes -qb $(PACKAGE)-$@-$(VERSION).$(REVISION).tar.gz
+ @$(GPG) --batch --yes -qb $(PACKAGE)-$@-$(VERSION).$(REVISION).tar.bz2
endif
- @for f in $$($(FIND) . -name $(distdir).\*); do $(CHMOD) 0644 $$f; done
+ @for f in $$($(FIND) . -name $(PACKAGE)-$@-$(VERSION).$(REVISION).\*); do $(CHMOD) 0644 $$f; done
# declare phony targets
-.PHONY : bone-clean rev summod distsum distchecksum install-desktop rpm srpm
+.PHONY : bone-clean src devel distdevel distcheckdevel install-desktop rpm srpm
# Remove ALL Autotools generated files
# WARNING: Use this with CAUTION
=== modified file 'VERSION.in'
--- VERSION.in 2010-11-20 06:41:55 +0000
+++ VERSION.in 2011-06-05 07:35:00 +0000
@@ -1,4 +1,4 @@
-Aiki Framework @VERSION@
+Aiki Framework @VERSION@.@REVISION@
-----
=== modified file 'configure.ac'
--- configure.ac 2011-06-02 22:44:26 +0000
+++ configure.ac 2011-06-05 07:35:00 +0000
@@ -25,13 +25,8 @@
[m4_esyscmd(echo -n $(grep define\(\'AIKI_VERSION\',\'.\\+\'\)\; src/aiki.php \
| sed s/.*define\(\'.\\+\',\''\(.*\)'\'\).*/'\1'/))])
-m4_define([revversion],
- [m4_esyscmd(echo -n $(bzr revno))])
-
-m4_define([allversion],[pkgversion][-][revversion])
-
# Initialize autoconf, set the name of this package and version
-AC_INIT([aiki], [allversion], [https://bugs.launchpad.net/aikiframework],,[http://aikiframework.org])
+AC_INIT([aiki], [pkgversion], [https://bugs.launchpad.net/aikiframework],,[http://aikiframework.org])
PACKAGE=aiki
# Search for auxiliary scripts in the build-aux directory
@@ -88,9 +83,6 @@
AC_CHECK_PROG(MYSQL,mysql,mysql,MISSING)
PROG_LIST_ADD MYSQL $MYSQL
-AC_CHECK_PROG(BZR,bzr,bzr,MISSING)
-PROG_LIST_ADD BZR $BZR
-
AC_CHECK_PROG(CHMOD,chmod,chmod,MISSING)
PROG_LIST_ADD CHMOD $CHMOD
@@ -364,6 +356,17 @@
AIKI_SITE_URL_LEN=$($ECHO "$AIKI_SITE_URL" | $AWK '{print length}')
AC_SUBST(AIKI_SITE_URL_LEN,$AIKI_SITE_URL_LEN)
+# Get the source control revision number.
+# This is BZR (Bazaar) specific.
+# BZR is NOT required due to .bzr/branch/last-revision
+# in the development distribution archives
+REVNFILE=$($FIND $srcdir/ -name last-revision)
+REVISION=$($AWK '{print $1; exit}' $REVNFILE)
+AC_SUBST(REVNFILE,$REVNFILE)
+AC_SUBST(REVISION,$REVISION)
+VAR_LIST_ADD REVNFILE $REVNFILE
+VAR_LIST_ADD REVISION $REVISION
+
# defaults for insert variable SQL
AC_SUBST(ADMIN_USER,[admin])
AC_SUBST(ADMIN_NAME,[admin])
=== modified file 'man/man.in'
--- man/man.in 2010-11-20 06:41:55 +0000
+++ man/man.in 2011-06-05 07:35:00 +0000
@@ -1,4 +1,4 @@
-.TH "@PACKAGE@" "1" "@PACKAGE@-@VERSION@" "aikiframework.org" "@GROUP@"
+.TH "@PACKAGE@" "1" "@PACKAGE@-@VERSION@.@REVISION@" "aikiframework.org" "@GROUP@"
.SH "NAME"
.LP
@@ -87,7 +87,9 @@
.RS 0
.nf
Bassel Safadi Lead Developer/Programmer
-Jon Phillips Project Manager
+Jon Phillips Project Manager/Developer
+Christopher Adams Developer
+Barry Threw Developer
Michi Krnac Developer
Ronaldo Barbachano Developer
Vera Lobatcheva Graphic Design
=== modified file 'scripts/aiki.in'
--- scripts/aiki.in 2010-11-20 06:41:55 +0000
+++ scripts/aiki.in 2011-06-05 07:35:00 +0000
@@ -82,7 +82,7 @@
};;
--version | -V)
{
- echo "@PACKAGE@ version @VERSION@"
+ echo "@PACKAGE@ version @VERSION@.@REVISION@"
exit $result
};;
--create-usr | -c)
=== modified file 'src/aiki.php'
--- src/aiki.php 2011-05-26 15:54:10 +0000
+++ src/aiki.php 2011-06-05 17:09:58 +0000
@@ -47,8 +47,15 @@
}else{
/**
* Aiki Framework Version
+ * The number left or west of the dots indicates a MAJOR production type release.
+ * The number in the middle of the dots indicates a significant change or MINOR changes.
+ * The number right or east of the dots indicates a bug FIX or small change.
+ * When the MINOR number changes, the FIX number should reset to zero.
+ * 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.9-dev');
+ define('AIKI_VERSION','0.8.2');
}
/*
@@ -90,6 +97,7 @@
$config = $aiki->get_config($config);
+$aiki->load("message");
$membership = $aiki->load("membership");
=== modified file 'src/configs/aiki-defs.inc'
--- src/configs/aiki-defs.inc 2010-12-28 00:26:30 +0000
+++ src/configs/aiki-defs.inc 2011-06-05 07:35:00 +0000
@@ -14,7 +14,7 @@
* @link @PACKAGE_URL@
* @category Aiki
* @package Aiki
- * @version @VERSION@
+ * @version @VERSION@.@REVISION@
* @filesource
*/
@@ -24,6 +24,10 @@
*/
define("AIKI_VERSION", "@VERSION@");
/**
+ * Aiki Framework Revision
+ */
+define("AIKI_REVISION", "@REVISION@");
+/**
* At run-time, write config and database or use an install-time config and database
* Do NOT put the following value (TRUE or FALSE) in quotes.
*/
=== modified file 'src/system/libraries/Makefile.am'
--- src/system/libraries/Makefile.am 2011-02-27 00:34:45 +0000
+++ src/system/libraries/Makefile.am 2011-06-03 22:46:52 +0000
@@ -30,6 +30,7 @@
installer.php \
languages.php \
membership.php \
+ message.php \
output.php \
parser.php \
php.php \
=== modified file 'src/system/libraries/bot.php'
--- src/system/libraries/bot.php 2011-01-12 05:33:32 +0000
+++ src/system/libraries/bot.php 2011-06-05 07:35:00 +0000
@@ -516,7 +516,7 @@
die("<br />FATAL: failed to read file -> $system_folder/system/sql/InsertDefaults.sql<br />");
}
- $output .= "your aiki installation is now up to date using version ".AIKI_VERSION;
+ $output .= "your aiki installation is now up to date using version ".AIKI_VERSION . "." . AIKI_REVISION;
return $output;
}
=== modified file 'src/system/libraries/installer.php'
--- src/system/libraries/installer.php 2010-12-28 21:57:27 +0000
+++ src/system/libraries/installer.php 2011-06-05 07:35:00 +0000
@@ -306,6 +306,7 @@
$sql_insert_variable = str_replace("@ADMIN_PASS@",$admin_password_md5_md5,$sql_insert_variable);
$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);
/* In MySQL, the â-- â (double-dash) comment style requires the second
* dash to be followed by at least one whitespace or control character.
=== added file 'src/system/libraries/message.php'
--- src/system/libraries/message.php 1970-01-01 00:00:00 +0000
+++ src/system/libraries/message.php 2011-06-03 22:59:10 +0000
@@ -0,0 +1,118 @@
+<?php
+
+/**
+ * Aiki Framework (PHP)
+ *
+ * LICENSE
+ *
+ * This source file is subject to the AGPL-3.0 license that is bundled
+ * with this package in the file LICENSE.
+ *
+ * @author Aikilab http://www.aikilab.com
+ * @copyright (c) 2008-2010 Aikilab
+ * @license http://www.fsf.org/licensing/licenses/agpl-3.0.html
+ * @link http://www.aikiframework.org
+ * @category Aiki
+ * @package Library
+ * @filesource
+ *
+ * BriefDescription
+ *
+ * This small module wants to be an attempt to unify all outbound
+ * messages from the application. Provides a function called 'message'
+ * charge of doing all the work, and a class called 'message' that
+ * can be added to object 'aiki'.
+ *
+ * No CSS is added except in two cases:
+ * - object aiki don't exist ( a error in init process?)
+ * - the user specifies the css (a practice whose use is not recommended)
+ * For all other cases it is assumed there is a css file who definid the styles
+ * of messages.
+ *
+ * The module redefined three types of messages:
+ * error, warning, ok, that generate messages of the
+ * class 'message-error', 'message-warning', 'message-ok', respectively.
+ *
+ *
+ * Examples:
+ * if (!$site_info){
+ * die( message("Fatal Error: Wrong site name provided",NULL, false) );
+ *
+ * $aiki->message->warning("No clipart's found");
+ * $aiki->message->error("No file upload", array("class"=>"fatal")); class will be 'message-error fatal'
+ * $aiki->message->general("Hi, Roger", array("id"=>"welcome"));
+ *
+ */
+
+
+if(!defined('IN_AIKI')){die('No direct script access allowed');}
+
+/*
+ * function message
+ *
+ * draft horse of module. Show o return a message.
+ *
+ * @param $text : text to show. Will be translated if there is a
+ * t (translate) function or is workin $aiki->languages
+ * @param $attribs (optional=NULL): array of html atributes (id,class, style,onmouse)..
+ * @param echo ($option=false) true, echo the result, and false return it.
+ */
+
+
+function message($text,$attribs=NULL, $echo = true) {
+ global $aiki;
+
+ if ( !isset($aiki) and !isset($attribs) ){
+ // when there isn't aiki object and not attributes are provides, assumes error.
+ $attribs['style']="background-color:#F8F8FF;color:#c00;font-weight:bold;padding:4px 6px;";
+ }
+
+ $tag = ( isset($attribs["tag"]) ? $attribs["tag"] : "div");
+ $cRet = "<$tag";
+ if (is_array($attribs)) {
+ foreach ( $attribs as $k=>$v) {
+ if( $k !="tag"){
+ $cRet .= " $k='$v' ";
+ }
+ }
+ }
+ if ( function_exists("t")) {
+ $text= t($text);
+ } elseif ( isset( $aiki->languages) ){
+ $text= $aiki->languages->L10n($text);
+ }
+ $cRet .= ">". $text. "</$tag>";
+ if ( !$echo ) {
+ return $cRet;
+ }
+ echo $cRet;
+ }
+
+
+class message {
+
+ private function Addclass ( $default, &$attribs ){
+ return $default . (isset($attribs['class']) ? " ". $attribs['class'] : "" );
+ }
+
+ function error( $text, $attribs=NULL, $echo = true){
+ $attribs['class']= $this->addclass('message-error', $attribs );
+ return message( $text,$attribs,$echo);
+ }
+
+ function warning( $text, $attribs=NULL, $echo = true){
+ $attribs['class']= $this->addclass('message-warning', $attribs );
+ return message( $text,$attribs,$echo);
+ }
+
+ function ok( $text, $attribs=NULL, $echo = true){
+ $attribs['class']= $this->addclass('message-ok', $attribs );
+ return message( $text,$attribs,$echo);
+ }
+
+ function general($text,$attribs=NULL, $echo = true) {
+ $attribs['class']= $this->addclass('message', $attribs );
+ return message( $text,$attribs,$echo);
+ }
+
+}
=== modified file 'src/system/libraries/output.php'
--- src/system/libraries/output.php 2011-03-20 09:42:36 +0000
+++ src/system/libraries/output.php 2011-06-05 07:35:00 +0000
@@ -47,7 +47,7 @@
<meta http-equiv="Content-Type" content="text/html; charset=__encoding__" />
<meta http-equiv="Content-Style-Type" content="text/css" />
<title>' . ( $this->title ? "$this->title - " : "" ) . $site_info->site_name . '</title>
- <meta name="generator" content="Aikiframework '.AIKI_VERSION.'" />
+ <meta name="generator" content="Aikiframework '.AIKI_VERSION.'.'.AIKI_REVISION.'" />
';
return $header;
=== modified file 'src/system/libraries/php.php'
--- src/system/libraries/php.php 2011-06-03 21:24:31 +0000
+++ src/system/libraries/php.php 2011-06-05 07:35:00 +0000
@@ -294,7 +294,7 @@
switch ($what) {
case "version":
case "hidden-version":
- return $what=="version" ? AIKI_VERSION : "\n<!-- aikiframework version: ". AIKI_VERSION . "-->\n";
+ return $what=="version" ? AIKI_VERSION : "\n<!-- aikiframework version: ". AIKI_VERSION . "." . AIKI_REVISION . " -->\n";
case "queries" :
case "hidden-queries" :
global $db;
=== modified file 'src/system/sql/InsertVariable-in.sql'
--- src/system/sql/InsertVariable-in.sql 2011-05-31 22:29:56 +0000
+++ src/system/sql/InsertVariable-in.sql 2011-06-05 07:35:00 +0000
@@ -41,7 +41,7 @@
-- ------------------------------------------------------
INSERT 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`, `custome_output`, `custome_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@</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@</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 Michi Krnac<br />\r\n Ronaldo Barbachano <br />\r\n Steven Garcia <br />\r\n Roger MartÃn <br />\r\n Vera Lobatcheva<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 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'),
(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="accordeon-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
