diff options
-rw-r--r-- | modules/organize/css/organize.css | 24 | ||||
-rw-r--r-- | modules/organize/views/organize_frame.html.php | 20 |
2 files changed, 32 insertions, 12 deletions
diff --git a/modules/organize/css/organize.css b/modules/organize/css/organize.css index 232a35cd..87ee8efa 100644 --- a/modules/organize/css/organize.css +++ b/modules/organize/css/organize.css @@ -69,13 +69,13 @@ margin-right: 4px; } -.g-organize .x-tree-node-el { - font-size: 12px; - line-height: 20px; -} - -.g-organize .x-tree-node-leaf .x-tree-node-icon{ - background-image:url(../vendor/ext/images/default/tree/folder.gif); +.g-organize label.sort { + font: 12px tahoma, arial; + vertical-align: middle; + font-weight: bold; + height: 22px; + text-align: center; + padding: 4px; } .loading div { @@ -86,3 +86,13 @@ background-position: 4px 8px; background-repeat: no-repeat; } + +/* ExtJS overrides */ +.x-tree-node-el { + font-size: 12px; + line-height: 20px; +} + +.x-tree-node-leaf .x-tree-node-icon{ + background-image:url(../vendor/ext/images/default/tree/folder.gif); +} diff --git a/modules/organize/views/organize_frame.html.php b/modules/organize/views/organize_frame.html.php index 7a125ec9..958b7414 100644 --- a/modules/organize/views/organize_frame.html.php +++ b/modules/organize/views/organize_frame.html.php @@ -21,11 +21,11 @@ * ******************************************************************************** */ var start_busy = function(msg) { - outer.el.mask(msg, "loading"); + thumb_data_view.el.mask(msg, "loading"); } var stop_busy = function() { - outer.el.unmask(); + thumb_data_view.el.unmask(); } var show_generic_error = function() { @@ -221,6 +221,7 @@ allowBlank: false, forceSelection: true, triggerAction: "all", + flex: 2, store: new Ext.data.ArrayStore({ id: 0, fields: ["key", "value"], @@ -241,6 +242,7 @@ allowBlank: false, forceSelection: true, triggerAction: "all", + flex: 2, store: new Ext.data.ArrayStore({ id: 0, fields: ["key", "value"], @@ -264,13 +266,21 @@ layoutConfig: { align: "stretch" }, - items: [sort_column_combobox, sort_order_combobox, + items: [ + { + xtype: "label", + cls: "sort", + flex: 2, + text: <?= t("Sort order: ")->for_js() ?> + }, + sort_column_combobox, + sort_order_combobox, { xtype: "spacer", - flex: 4 + flex: 10 }, { xtype: "button", - flex: 1, + flex: 2, text: <?= t("Close")->for_js() ?>, listeners: { "click": function() { |