------------------------------------------------------------
revno: 1030
committer: Jon Phillips <[email protected]>
branch nick: public
timestamp: Mon 2012-01-16 16:29:35 +0800
message:
* small css fix
modified:
assets/apps/admin/control_panel.js
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 'assets/apps/admin/control_panel.js'
--- assets/apps/admin/control_panel.js 2012-01-16 08:23:17 +0000
+++ assets/apps/admin/control_panel.js 2012-01-16 08:29:35 +0000
@@ -98,7 +98,7 @@
show_all_fields();
- $('<div id="tools_box" style="background: none repeat scroll 0pt 0pt rgb(221, 221, 221); border-width: 1px 1px 0 1px; border-style: solid solid none solid; border-color: rgb(170, 170, 170); position: fixed; bottom: 0; z-index: 10000; right: 11.2%; opacity: 0.6; filter: alpha(opacity=60); border-radius: 2px 2px 2px 2px; min-width: 380px;">' +
+ $('<div id="tools_box" style="background: none repeat scroll 0pt 0pt rgb(221, 221, 221); border-width: 1px 1px 0 1px; border-style: solid solid none solid; border-color: rgb(170, 170, 170); position: fixed; bottom: 0; z-index: 10000; right: 12.3%; opacity: 0.6; filter: alpha(opacity=60); border-radius: 2px 2px 2px 2px; min-width: 380px;">' +
'<ul style="cursor:pointer;">' +
'<li style="display:block; float: left; padding:11px;" class="widget_editor_li" id="widget_tools"><a>Content</a>' +
'<li style="display:block; float: left; padding:11px;" class="widget_editor_li" id="sql_tools"><a>Sql</a>' +
=== modified file 'sql/InsertVariable-in.sql'
--- sql/InsertVariable-in.sql 2012-01-16 08:23:17 +0000
+++ sql/InsertVariable-in.sql 2012-01-16 08:29:35 +0000
@@ -64,7 +64,7 @@
(16, 1, 'auto_generate', 'default', 'body', 'div', 2, '', '0', 0, 'admin_tools/auto_generate/(.*)', '', '', '', '', '', '', '', 0, 0, '', '', 1, '<php $aiki->Bot->ShowTableStructure( (!(2)!) ); php>', 'SystemGOD', 0, 0, 1, '', 1, 2, 'w'),
(17, 1, 'admin_javascript', 'default', 'header', '0', 3, '', '0', 0, 'admin', '', '', '', '', '', '', '', 0, 0, '', '', 1, '<script type="text/javascript" src="[root]/assets/javascript/jquery/plugins/jquery.layout.min.js"></script>\r\n<script type="text/javascript" src="[root]/assets/javascript/jquery/plugins/css.js"></script>\r\n<script type="text/javascript" src="[root]/assets/javascript/jquery/plugins/jstree/tree_component.js"></script>\r\n<script type="text/javascript" src="[root]/assets/javascript/jquery/plugins/jstree/sarissa.js"></script>\r\n<script type="text/javascript" src="[root]/assets/javascript/jquery/plugins/jstree/sarissa_ieemu_xpath.js"></script>\r\n<script type="text/javascript" src="[root]/assets/javascript/jquery/plugins/jquery.xslt.js"></script>\r\n<script type="text/javascript" src="[root]assets/apps/admin/control_panel.js"></script>\r\n<link rel="stylesheet" type="text/css" href="[root]/assets/javascript/jquery/plugins/jstree/tree_component.css" />\r\n<script type="text/javascript" src="[root]/assets/javascript/jquery/jquery-ui-1.7.2.custom.min.js"></script>\r\n<link rel="stylesheet" type="text/css" href="[root]/assets/javascript/jquery/css/smoothness/jquery-ui-1.7.1.custom.css" />\r\n<script src="[root]/assets/javascript/codemirror/js/codemirror.js" type="text/javascript"></script>\r\n<link rel="stylesheet" type="text/css" href="[root]/assets/javascript/codemirror/css/docs.css"/>\r\n<style type="text/css">\r\n.CodeMirror-line-numbers {width: 2.2em;color: #aaa;background-color: #eee;text-align: right;padding-right: .3em;font-size: 10pt;font-family: monospace;padding-top: .4em;}\r\n</style>', 'SystemGOD', 0, 0, 0, '', 1, 2, 'w'),
(18, 0, 'global_javascript', 'default', 'header', '0', 2, '', '', 0, '*', 'admin', '', '', '', "<script type='text/javascript' src='[root]/assets/javascript/jquery/jquery-1.4.2.min.js'></script>\r\n<script type='text/javascript' src='[root]/assets/javascript/jquery/plugins/jquery.form.js'></script>\r\n<script type='text/javascript' src='[root]/assets/javascript/aiki.js'></script>", '', '', 0, 0, '', '', 0, '', '', 0, 0, 0, '', 1, 2, 'w'),
-(19, 0, 'style.css', 'default', 'body', '0', 0, '', '0', 0, 'globals/admin_style.css', '', '\n', '', '', 'html, body, div, span, applet, object, p, a, em, img, strong, ol, ul, li, dl, dd, dt, label, h1, h2, h3, h4, h5, h6{\n margin: 0;\n padding: 0;\n border: 0;\n outline: 0;\n font-style: inherit;\n font-size: 100%;\n font-family: inherit;\n vertical-align: baseline;\n background: transparent;\n}\n:focus{\noutline: 0;\n}\nul{\n list-style: none;\n}\nol{\nlist-style-position: inside; \n}\nbody, html{\n padding: 0;\n margin: 0;\n font-family: "Bitstream Vera Sans", Tahoma, sans-serif;\n font-size: 9pt;\n color: #000;\n height: 100%;\n background: #FFF;\n line-height: 1;\n}\n* html #container{\nheight: 100%;\n}\nimg{\n border: 0;\n}\na:link, a:visited{\n outline: none;\n text-decoration: none;\n color: #1B3B6B;\n}\na:hover, a:active{\n text-decoration: underline;\n color: #1B3B6B;\n}\n.clear{\n clear: both;\n font-size: 0.3pt;\n}\n.clearfix:after{\n content: ".";\n display: block;\n clear: both;\n visibility: hidden;\n line-height: 0;\n height: 0;\n}\n.clearfix{\n display: inline-block;\n}\n* html .clearfix{\n\n}\n.tree-context{\nz-index:999; \n}\n\n\n.edit_button{\n-moz-border-radius:2px 2px 2px 2px;\nbackground:none repeat scroll 0 0 #F57900;\nborder:0 none;\nbottom:0;\ncolor:#FFFFFF;\nfont-weight:bold;\nposition:fixed;\nright:1%;\nwidth:8%;\nheight:35px;\nopacity:0.8;\nfilter:alpha(opacity=80);\nfont-weight:16pt;\ncursor:pointer;\n}\n\n.edit_button a:hover {text-decoration: underline;}\n.edit_button:hover { opacity:1.0; filter:alpha(opacity=100);}\n#log-content {\n\tline-height: normal;\n}\n.log-content-line-error {\n\tbackground-color: #fdd;\n}\n.log-content-line-warn {\n\tbackground-color: #ffc;\n}\n.log-content-line-info {\n\tbackground-color: #d4ffd4;\n}\n.log-content-line-debug {\n\tbackground-color: #f4f4ff;\n}\n.log-content-tag-error {\n\tcolor: #800;\n}\n.log-content-tag-warn {\n\tcolor: #770;\n}\n.log-content-tag-info {\n\tcolor: #070;\n}\n.log-content-tag-debug {\n\tcolor: #008;\n}\n', '', '', 0, 0, '', '', 0, '\n', '', 0, 0, 1, 'Content-type: text/css', 1, 2, 'w'),
+(19, 0, 'style.css', 'default', 'body', '0', 0, '', '0', 0, 'globals/admin_style.css', '', '\n', '', '', 'html, body, div, span, applet, object, p, a, em, img, strong, ol, ul, li, dl, dd, dt, label, h1, h2, h3, h4, h5, h6{\n margin: 0;\n padding: 0;\n border: 0;\n outline: 0;\n font-style: inherit;\n font-size: 100%;\n font-family: inherit;\n vertical-align: baseline;\n background: transparent;\n}\n:focus{\noutline: 0;\n}\nul{\n list-style: none;\n}\nol{\nlist-style-position: inside; \n}\nbody, html{\n padding: 0;\n margin: 0;\n font-family: "Bitstream Vera Sans", Tahoma, sans-serif;\n font-size: 9pt;\n color: #000;\n height: 100%;\n background: #FFF;\n line-height: 1;\n}\n* html #container{\nheight: 100%;\n}\nimg{\n border: 0;\n}\na:link, a:visited{\n outline: none;\n text-decoration: none;\n color: #1B3B6B;\n}\na:hover, a:active{\n text-decoration: underline;\n color: #1B3B6B;\n}\n.clear{\n clear: both;\n font-size: 0.3pt;\n}\n.clearfix:after{\n content: ".";\n display: block;\n clear: both;\n visibility: hidden;\n line-height: 0;\n height: 0;\n}\n.clearfix{\n display: inline-block;\n}\n* html .clearfix{\n\n}\n.tree-context{\nz-index:999; \n}\n\n\n.edit_button{\n-moz-border-radius:2px 2px 2px 2px;\nbackground:none repeat scroll 0 0 #F57900;\nborder:0 none;\nbottom:0;\ncolor:#FFFFFF;\nfont-weight:bold;\nposition:fixed;\nright:3%;\nwidth:8%;\nheight:35px;\nopacity:0.8;\nfilter:alpha(opacity=80);\nfont-weight:16pt;\ncursor:pointer;\n}\n\n.edit_button a:hover {text-decoration: underline;}\n.edit_button:hover { opacity:1.0; filter:alpha(opacity=100);}\n#log-content {\n\tline-height: normal;\n}\n.log-content-line-error {\n\tbackground-color: #fdd;\n}\n.log-content-line-warn {\n\tbackground-color: #ffc;\n}\n.log-content-line-info {\n\tbackground-color: #d4ffd4;\n}\n.log-content-line-debug {\n\tbackground-color: #f4f4ff;\n}\n.log-content-tag-error {\n\tcolor: #800;\n}\n.log-content-tag-warn {\n\tcolor: #770;\n}\n.log-content-tag-info {\n\tcolor: #070;\n}\n.log-content-tag-debug {\n\tcolor: #008;\n}\n', '', '', 0, 0, '', '', 0, '\n', '', 0, 0, 1, 'Content-type: text/css', 1, 2, 'w'),
(20, 0, 'admin_css', 'default', 'header', '0', 1, '', '0', 0, 'admin', '', '', '', '', '<link rel="stylesheet" type="text/css" href="[root]/globals/admin_style.css" />', '', '', 0, 0, '', '', 0, '', '', 0, 0, 0, '', 1, 2, 'w'),
(21, 0, 'logout', 'default', 'body', 'div', 0, '', '0', 0, 'admin_tools/logout', '', '', '', '', '(#(header:Location: [root]/admin)#)', '', '', 0, 0, '', 'Aikiframework', 1, '<php $aiki->membership->LogOut(); php> <p>Logging out please wait...</p> <meta http-equiv="refresh" content="2;url=[root]/admin"> <p><a href="[root]/admin">Click here if your browser does not support redirect</a>.</p>', 'SystemGOD', 0, 0, 0, '', 1, 2, 'w'),
(22, 0, 'global_css', 'default', 'header', '0', 2, '', '', 0, '*', 'admin', '', '', '', '', '', '', 0, 0, '', '', 0, '', '', 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
