------------------------------------------------------------
revno: 1005
committer: Jakub Jankiewicz <[email protected]>
branch nick: aikiframework
timestamp: Sat 2012-01-07 11:28:04 +0100
message:
remove CTRL+Arrow to show/hide widget tree in Admin Panel
modified:
assets/apps/admin/control_panel.js
libs/url.php
--
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 2011-11-08 13:42:45 +0000
+++ assets/apps/admin/control_panel.js 2012-01-07 10:28:04 +0000
@@ -620,79 +620,94 @@
/**
* Executes when the DOM is fully loaded. This is basically
* the main entry point to the JS control panel. */
-$().ready(function() {
- $("#dialog").dialog({ autoOpen: false });
+$(function() {
+
+ $("#dialog").dialog({
+ autoOpen: false
+ });
$("#aiki-icon-button").click(function(){
$("#dialog").dialog('open');
});
var outerLayout; // init global vars
- // PAGE LAYOUT
- outerLayout = $('body').layout({
- applyDefaultStyles: true
- // AUTO-RESIZE Accordion widget when west pane resizes
- , west__onresize: function () { $("#structur_accordion").accordion("resize"); }
- , west__onopen: function () { $("#structur_accordion").accordion("resize"); }
- , center__onresize: function () { $("#accordion-center").accordion("resize"); }
- , center__onopen: function () { $("#accordion-center").accordion("resize"); }
- , west__size: 300
- });
-
- structur_accordion();
-
- widget_accordion();
-
- aiki_log("Sql Command: <input type='text' id='sql_query' name='sql_query' style='border: 1px solid; width: 80%;'>" +
- "<input type='button' id='submit_query' name='submit_query' value='Run' style='border: 1px solid'>");
+ // PAGE LAYOUT
+ outerLayout = $('body').layout({
+ applyDefaultStyles: true,
+
+ // AUTO-RESIZE Accordion widget when west pane resizes
+ west__onresize: function() {
+ $("#structur_accordion").accordion("resize");
+ },
+ west__onopen: function() {
+ $("#structur_accordion").accordion("resize");
+ },
+ center__onresize: function() {
+ $("#accordion-center").accordion("resize");
+ },
+ center__onopen: function() {
+ $("#accordion-center").accordion("resize");
+ },
+ west__size: 300,
+ slidable: false,
+ closable: false,
+ enableCursorHotkey: false
+ });
+
+ structur_accordion();
+
+ widget_accordion();
+
+ aiki_log("Sql Command: <input type='text' id='sql_query' name='sql_query' style='border: 1px solid; width: 80%;'>" +
+ "<input type='button' id='submit_query' name='submit_query' value='Run' style='border: 1px solid'>");
- $("#submit_query").click(function(event){
+ $("#submit_query").click(function(event){
var query_value = $('#sql_query').val();
- $.post("assets/apps/admin/run_sql.php", { sql_query: query_value},
- function(data){
- aiki_log(data);
- });
- });
-
- $("#database_forms").click(function(event){
- database_forms_tree();
- });
-
- $("#urls_widgets").click(function(event){
- urls_widgets_tree();
- });
-
- $("#remove").live('click', function(event){
-
- $(this).parent().remove();
-
- return false;
- });
-
- // The following line is autoconf generated
- //
-
- // append the log button to the main navigation
- $("<li><a href='#' id='log-button'>Log</a></li>").appendTo("#main-navigation");
- // when the log button is clicked,
- // display the log view interface.
- $("#log-button").click(function(event) {
- log_view();
- });
-
- $("<li><a href='#' id='open_events_listener'>Events</a></li>").appendTo("#main-navigation");
- $("<div id='events_output' title='Events'></div>").appendTo("#header");
- $("#events_output").load("assets/apps/admin/events.php");
- $("#events_output").dialog({width: 420, autoOpen: false});
-
- $("#open_events_listener").click(function(){
- $("#events_output").dialog('open');
- });
-
- var refreshId = setInterval(function(){
- if ($("#events_output").dialog( "isOpen" )){
- $("#events_output").load("assets/apps/admin/events.php");
- }
- }, 3000);
+ $.post("assets/apps/admin/run_sql.php", { sql_query: query_value},
+ function(data){
+ aiki_log(data);
+ });
+ });
+
+ $("#database_forms").click(function(event){
+ database_forms_tree();
+ });
+
+ $("#urls_widgets").click(function(event){
+ urls_widgets_tree();
+ });
+
+ $("#remove").live('click', function(event){
+
+ $(this).parent().remove();
+
+ return false;
+ });
+
+ // The following line is autoconf generated
+ //
+
+ // append the log button to the main navigation
+ $("<li><a href='#' id='log-button'>Log</a></li>").appendTo("#main-navigation");
+ // when the log button is clicked,
+ // display the log view interface.
+ $("#log-button").click(function(event) {
+ log_view();
+ });
+
+ $("<li><a href='#' id='open_events_listener'>Events</a></li>").appendTo("#main-navigation");
+ $("<div id='events_output' title='Events'></div>").appendTo("#header");
+ $("#events_output").load("assets/apps/admin/events.php");
+ $("#events_output").dialog({width: 420, autoOpen: false});
+
+ $("#open_events_listener").click(function(){
+ $("#events_output").dialog('open');
+ });
+
+ var refreshId = setInterval(function(){
+ if ($("#events_output").dialog( "isOpen" )){
+ $("#events_output").load("assets/apps/admin/events.php");
+ }
+ }, 3000);
});
=== modified file 'libs/url.php'
--- libs/url.php 2011-11-08 13:42:45 +0000
+++ libs/url.php 2012-01-07 10:28:04 +0000
@@ -137,7 +137,7 @@
* @return boolean
*/
- public function match($displayString){
+ public function match($displayString) {
if ($displayString) {
// a regular expression can containe a | character, that must be
_______________________________________________
Mailing list: https://launchpad.net/~aikiframework-devel
Post to : [email protected]
Unsubscribe : https://launchpad.net/~aikiframework-devel
More help : https://help.launchpad.net/ListHelp
