From 8d250cb1b2c2bd659f8d6fd57c3aa075743a5f2b Mon Sep 17 00:00:00 2001 From: rlx Date: Tue, 12 Jan 2016 11:03:41 +0530 Subject: [PATCH] more squared ui elements --- static/js/appDialog.js | 2 ++ static/js/preferencesDialog.js | 15 +++++++++++++++ 2 files changed, 17 insertions(+) diff --git a/static/js/appDialog.js b/static/js/appDialog.js index 02d3754..e67d86a 100644 --- a/static/js/appDialog.js +++ b/static/js/appDialog.js @@ -122,6 +122,7 @@ oml.ui.appDialog = function() { orientation: 'horizontal' }); }, + style: 'squared', tabs: tabs }) .bindEvent({ @@ -146,6 +147,7 @@ oml.ui.appDialog = function() { fixedSize: true, height: 384, removeOnClose: true, + style: 'squared', title: 'Open Media Library', width: 768 }) diff --git a/static/js/preferencesDialog.js b/static/js/preferencesDialog.js index 574ef57..0937e50 100644 --- a/static/js/preferencesDialog.js +++ b/static/js/preferencesDialog.js @@ -187,6 +187,7 @@ oml.ui.preferencesDialog = function() { .appendTo($main), $formLabel = Ox.Label({ + style: 'squared', width: 512 }) .hide() @@ -203,11 +204,13 @@ oml.ui.preferencesDialog = function() { .appendTo($main), $helpLabel = Ox.Label({ + style: 'squared', width: 176 }), $closeButton = Ox.Button({ overlap: 'left', + style: 'squared', title: 'close', tooltip: Ox._('Hide'), type: 'image' @@ -244,6 +247,7 @@ oml.ui.preferencesDialog = function() { $usersButton = Ox.Button({ id: 'users', + style: 'squared', title: Ox._('Users...') }) .bindEvent({ @@ -254,6 +258,7 @@ oml.ui.preferencesDialog = function() { $notificationsButton = Ox.Button({ id: 'notifications', + style: 'squared', title: Ox._('Notifications...') }) .bindEvent({ @@ -280,6 +285,7 @@ oml.ui.preferencesDialog = function() { {}, Ox.Button({ id: 'done', + style: 'squared', title: Ox._('Done') }) .bindEvent({ @@ -330,11 +336,13 @@ oml.ui.preferencesDialog = function() { $formTitle = Ox.FormElementGroup({ elements: [ Ox.Label({ + style: 'squared', title: Ox._(formItems[0].title), width: 384 }), Ox.Button({ overlap: 'left', + style: 'squared', title: 'help', type: 'image' }) @@ -359,6 +367,7 @@ oml.ui.preferencesDialog = function() { elements: [ item.click ? Ox.Button({ + style: 'squared', title: Ox._(item.title), width: 256 }) @@ -370,18 +379,21 @@ oml.ui.preferencesDialog = function() { items: item.items, label: Ox._(item.title), labelWidth: 128, + style: 'squared', value: item.value, width: 384 - !!item.unit * 48 }) : item.type == 'textarea' ? Ox.Input({ height: 328, + style: 'squared', type: 'textarea', value: oml.user.preferences[item.id] || item.value, width: 400 }) : Ox.isBoolean(item.value) ? Ox.Checkbox({ + style: 'squared', title: Ox._(item.title), value: item.value, width: 384 @@ -392,6 +404,7 @@ oml.ui.preferencesDialog = function() { label: Ox._(item.title), labelWidth: 128, placeholder: item.placeholder || '', + style: 'squared', value: oml.user.preferences[item.id] || item.value || '', width: 384 - !!item.unit * 48 }) @@ -399,12 +412,14 @@ oml.ui.preferencesDialog = function() { ].concat(item.unit ? [ Ox.Label({ overlap: 'left', + style: 'squared', title: item.unit, width: 48 }) ] : []).concat(item.type != 'textarea' ? [ Ox.Button({ overlap: 'left', + style: 'squared', title: 'help', type: 'image' })