------------------------------------------------------------
revno: 833
committer: Steven Garcia <steven@satellite>
branch nick: aikiframework
timestamp: Sat 2011-06-11 20:58:23 -0700
message:
Corrected spellings from accordeon to accordion
renamed:
src/assets/apps/admin/images/accordeon_active.png =>
src/assets/apps/admin/images/accordion_active.png
src/assets/apps/admin/images/accordeon_default.png =>
src/assets/apps/admin/images/accordion_default.png
modified:
src/assets/apps/admin/images/Makefile.am
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 'src/assets/apps/admin/images/Makefile.am'
--- src/assets/apps/admin/images/Makefile.am 2011-06-06 05:34:28 +0000
+++ src/assets/apps/admin/images/Makefile.am 2011-06-12 03:58:23 +0000
@@ -19,8 +19,8 @@
# The source files
aiki_src_files = \
- accordeon_active.png \
- accordeon_default.png \
+ accordion_active.png \
+ accordion_default.png \
aiki-icon.png \
input_bg.png \
input_button_active.png \
=== renamed file 'src/assets/apps/admin/images/accordeon_active.png' => 'src/assets/apps/admin/images/accordion_active.png'
=== renamed file 'src/assets/apps/admin/images/accordeon_default.png' => 'src/assets/apps/admin/images/accordion_default.png'
=== modified file 'src/system/sql/InsertVariable-in.sql'
--- src/system/sql/InsertVariable-in.sql 2011-06-11 23:24:13 +0000
+++ src/system/sql/InsertVariable-in.sql 2011-06-12 03:58:23 +0000
@@ -44,7 +44,7 @@
(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'),
+(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'),
(5, 1, 'edit_record', 'default', 'body', 'div', 0, '', '0', 0, 'admin_tools/edit/(.*)/(.*)', '', '', '', '', '', '', '', 0, 0, '', '', 1, '(#(form:edit:(!(2)!):(!(3)!))#)', 'SystemGOD', 0, 0, 1, '', 1, 2, 'w'),
(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'),
_______________________________________________
Mailing list: https://launchpad.net/~aikiframework-devel
Post to : aikiframework-devel@lists.launchpad.net
Unsubscribe : https://launchpad.net/~aikiframework-devel
More help : https://help.launchpad.net/ListHelp
