Massive improvements to keyboard nav
This commit is contained in:
@@ -1,29 +1,34 @@
|
||||
<%@ Control Language="C#" AutoEventWireup="true" CodeFile="DropDown.ascx.cs" Inherits="Swarmops.Frontend.Controls.v5.Base.DropDown" %>
|
||||
|
||||
<script language="javascript" type="text/javascript">
|
||||
<script type="text/javascript">
|
||||
$(document).ready(function () {
|
||||
$('#<%=this.DropControl.ClientID %>').combobox({
|
||||
animate: true,
|
||||
height: 30
|
||||
});
|
||||
$(document).ready(function () {
|
||||
$('#<%=this.DropControl.ClientID %>').combobox({
|
||||
editable: false,
|
||||
height: 30,
|
||||
width: 300
|
||||
});
|
||||
$('#<%=this.DropControl.ClientID %>').combobox('setValue', '<%=this.DropControl.SelectedValue%>');
|
||||
|
||||
$('#<%=this.DropControl.ClientID %> span.combo input.combo-text').click(function () {
|
||||
$('#<%=this.DropControl.ClientID %> span.combo span span.combo-arrow').click();
|
||||
});
|
||||
$('#<%=this.DropControl.ClientID %> + span.combo > input.combo-text').click(function () {
|
||||
$('#<%=this.DropControl.ClientID %> + span.combo > span > span.combo-arrow').click();
|
||||
});
|
||||
|
||||
$('#<%=this.DropControl.ClientID %>_SpanBudgets span.combo input.combo-text').keydown(function (e) {
|
||||
switch (e.which) {
|
||||
case 40: // down
|
||||
$('#<%=this.DropControl.ClientID %>_SpanBudgets span.combo span span.combo-arrow').click();
|
||||
break;
|
||||
$('#<%=this.DropControl.ClientID %> + span.combo > input.combo-text').keydown(function (e) {
|
||||
switch (e.which) {
|
||||
case 40: // down
|
||||
var panel = $('#<%=this.DropControl.ClientID %>').combo('panel');
|
||||
if (!panel.is(':visible')) {
|
||||
$('#<%=this.DropControl.ClientID %> + span.combo > span > span.combo-arrow').click();
|
||||
panel.focus();
|
||||
}
|
||||
break;
|
||||
|
||||
default: return; // exit this handler for other keys
|
||||
}
|
||||
e.preventDefault(); // prevent the default action (scroll / move caret)
|
||||
default: return; // exit this handler for other keys
|
||||
}
|
||||
e.preventDefault(); // prevent the default action (scroll / move caret)
|
||||
});
|
||||
});
|
||||
});
|
||||
</script>
|
||||
</script>
|
||||
|
||||
|
||||
<asp:DropDownList ID="DropControl" runat="server" />
|
||||
|
||||
@@ -21,7 +21,7 @@ namespace Swarmops.Frontend.Controls.v5.Base
|
||||
|
||||
public string SelectedValue
|
||||
{
|
||||
get { return this.SelectedValue; }
|
||||
get { return this.DropControl.SelectedValue; }
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -24,7 +24,11 @@
|
||||
$('#<%=this.ClientID %>_SpanBudgets span.combo input.combo-text').keydown(function (e) {
|
||||
switch (e.which) {
|
||||
case 40: // down
|
||||
$('#<%=this.ClientID %>_SpanBudgets span.combo span span.combo-arrow').click();
|
||||
var panel = $('#<%=this.ClientID %>_DropBudgets').combotree('panel');
|
||||
if (!panel.is(':visible')) {
|
||||
$('#<%=this.ClientID %>_SpanBudgets span.combo span span.combo-arrow').click();
|
||||
panel.focus();
|
||||
}
|
||||
break;
|
||||
|
||||
default: return; // exit this handler for other keys
|
||||
@@ -32,6 +36,67 @@
|
||||
e.preventDefault(); // prevent the default action (scroll / move caret)
|
||||
});
|
||||
});
|
||||
|
||||
// below code from http://doc.javake.cn/jeasyui/www.jeasyui.com/forum/index.php-topic=1972.0.htm, understood to be in public domain
|
||||
|
||||
(function () {
|
||||
$.extend($.fn.combotree.methods, {
|
||||
nav: function (jq, dir) {
|
||||
return jq.each(function () {
|
||||
var opts = $(this).combotree('options');
|
||||
var t = $(this).combotree('tree');
|
||||
var nodes = t.tree('getChildren');
|
||||
if (!nodes.length) { return }
|
||||
var node = t.tree('getSelected');
|
||||
if (!node) {
|
||||
t.tree('select', dir > 0 ? nodes[0].target : nodes[nodes.length - 1].target);
|
||||
} else {
|
||||
var index = 0;
|
||||
for (var i = 0; i < nodes.length; i++) {
|
||||
if (nodes[i].target == node.target) {
|
||||
index = i;
|
||||
break;
|
||||
}
|
||||
}
|
||||
if (dir > 0) {
|
||||
while (index < nodes.length - 1) {
|
||||
index++;
|
||||
if ($(nodes[index].target).is(':visible')) { break }
|
||||
}
|
||||
} else {
|
||||
while (index > 0) {
|
||||
index--;
|
||||
if ($(nodes[index].target).is(':visible')) { break }
|
||||
}
|
||||
}
|
||||
t.tree('select', nodes[index].target);
|
||||
}
|
||||
if (opts.selectOnNavigation) {
|
||||
var node = t.tree('getSelected');
|
||||
$(node.target).trigger('click');
|
||||
$(this).combotree('showPanel');
|
||||
}
|
||||
});
|
||||
}
|
||||
});
|
||||
$.extend($.fn.combotree.defaults.keyHandler, {
|
||||
up: function () {
|
||||
$(this).combotree('nav', -1);
|
||||
},
|
||||
down: function () {
|
||||
$(this).combotree('nav', 1);
|
||||
},
|
||||
enter: function () {
|
||||
var t = $(this).combotree('tree');
|
||||
var node = t.tree('getSelected');
|
||||
if (node) {
|
||||
$(node.target).trigger('click');
|
||||
}
|
||||
$(this).combotree('hidePanel');
|
||||
}
|
||||
});
|
||||
})(jQuery);
|
||||
|
||||
</script>
|
||||
|
||||
<span id="<%=this.ClientID %>_SpanBudgets"><select class="easyui-combotree" url="<%=this.DataUrl %>" name="DropBudgets" id="<%=this.ClientID %>_DropBudgets" animate="true" style="width:300px"></select></span>
|
||||
@@ -1,35 +1,11 @@
|
||||
<%@ Page Title="" Language="C#" MasterPageFile="~/Master-v5.master" AutoEventWireup="true" CodeFile="CreateOrganization.aspx.cs" Inherits="Swarmops.Frontend.Pages.v5.Admin.CreateOrganization" %>
|
||||
<%@ Register TagPrefix="Swarmops5" TagName="ExternalScripts" Src="~/Controls/v5/UI/ExternalScripts.ascx" %>
|
||||
<%@ Register TagPrefix="Swarmops5" TagName="DropDown" Src="~/Controls/v5/Base/DropDown.ascx" %>
|
||||
|
||||
<asp:Content ID="Content4" ContentPlaceHolderID="PlaceHolderHead" Runat="Server">
|
||||
<script type="text/javascript">
|
||||
|
||||
$(document).ready(function () {
|
||||
$('#<%=this.TextOrganizationName.ClientID %>').focus();
|
||||
|
||||
$('#<%=this.DropCreateChild.ClientID %>').combobox({
|
||||
editable: false,
|
||||
height: 30,
|
||||
width: 300
|
||||
});
|
||||
|
||||
$('#<%=this.DropCurrencies.ClientID%>').combobox({
|
||||
editable: false,
|
||||
height: 30,
|
||||
width: 300
|
||||
});
|
||||
|
||||
$('#<%=this.DropPersonLabel.ClientID%>').combobox({
|
||||
editable: false,
|
||||
height: 30,
|
||||
width: 300
|
||||
});
|
||||
|
||||
$('#<%=this.DropActivistLabel.ClientID%>').combobox({
|
||||
editable: false,
|
||||
height: 30,
|
||||
width: 300
|
||||
});
|
||||
});
|
||||
|
||||
function validateFields() {
|
||||
@@ -43,10 +19,10 @@
|
||||
<asp:Content ID="Content5" ContentPlaceHolderID="PlaceHolderMain" Runat="Server">
|
||||
<div class="entryFields">
|
||||
<asp:TextBox runat="server" ID="TextOrganizationName" />​<br/>
|
||||
<asp:DropDownList runat="server" ID="DropCreateChild" />​<br/>
|
||||
<asp:DropDownList runat="server" ID="DropCurrencies"/>​<br/>
|
||||
<asp:DropDownList runat="server" ID="DropPersonLabel" />​<br/>
|
||||
<asp:DropDownList runat="server" ID="DropActivistLabel" />​<br/>
|
||||
<Swarmops5:DropDown runat="server" ID="DropCreateChild" />​<br/>
|
||||
<Swarmops5:DropDown runat="server" ID="DropCurrencies"/>​<br/>
|
||||
<Swarmops5:DropDown runat="server" ID="DropPersonLabel" />​<br/>
|
||||
<Swarmops5:DropDown runat="server" ID="DropActivistLabel" />​<br/>
|
||||
<asp:Button ID="ButtonCreate" runat="server" CssClass="buttonAccentColor NoInputFocus" OnClientClick="return validateFields();" OnClick="ButtonCreate_Click" Text="CreateXYZ"/>
|
||||
</div>
|
||||
<div class="entryLabels">
|
||||
|
||||
@@ -1,5 +1,6 @@
|
||||
<%@ Page Title="" Language="C#" MasterPageFile="~/Master-v5.master" AutoEventWireup="true" CodeFile="EditOrganization.aspx.cs" Inherits="Swarmops.Frontend.Pages.v5.Admin.EditOrganization" %>
|
||||
<%@ Register tagPrefix="Swarmops5" tagName="FileUpload" src="~/Controls/v5/Base/FileUpload.ascx" %>
|
||||
<%@ Register tagPrefix="Swarmops5" tagName="DropDown" src="~/Controls/v5/Base/DropDown.ascx" %>
|
||||
|
||||
<asp:Content ID="Content1" ContentPlaceHolderID="PlaceHolderHead" Runat="Server">
|
||||
|
||||
@@ -54,6 +55,16 @@
|
||||
</div>
|
||||
<div title="<img src='/Images/Icons/iconshock-group-diversified-64px.png' />">
|
||||
<h2>Participant policy</h2>
|
||||
<div class="entryFields">
|
||||
<Swarmops5:DropDown ID="DropMembersWhen" CssClass="DropTemp" runat="server"/>​<br/>
|
||||
<Swarmops5:DropDown ID="DropMembersWhere" CssClass="DropTemp" runat="server"/>​<br/>
|
||||
<Swarmops5:DropDown ID="DropMembersChurn" CssClass="DropTemp" runat="server"/>​<br/>
|
||||
<Swarmops5:DropDown ID="DropMembershipDuration" CssClass="DropTemp" runat="server"/>​<br/>
|
||||
<asp:TextBox ID="TextMembershipCost" runat="server" CssClass="alignRight" Text="0" />​<br/>
|
||||
<asp:TextBox ID="TextRenewalCost" runat="server" CssClass="alignRight" Text="0" />​<br/>
|
||||
<Swarmops5:DropDown ID="DropRenewalsAffect" CssClass="DropTemp" runat="server"/>​<br/>
|
||||
<Swarmops5:DropDown ID="DropRenewalReminder" CssClass="DropTemp" runat="server"/>​<br/>
|
||||
</div>
|
||||
<div class="entryLabels">
|
||||
People become members when... [applied, applied+approved, applied+paid, applied+paid+approved, invited+paid, manual only]<br/>
|
||||
People become members in... [root org only, most local org only, root + local, all on line root-local]<br/>
|
||||
@@ -70,8 +81,9 @@
|
||||
<div class="entryFields">
|
||||
<Swarmops5:FileUpload ID="UploadLogoLandscape" DisplayCount="1" runat="server" />
|
||||
<Swarmops5:FileUpload ID="UploadLogoSquare" DisplayCount="1" runat="server" />
|
||||
Bar <br/>
|
||||
<br/>
|
||||
<Swarmops5:FileUpload ID="UploadInvoiceTemplate" DisplayCount="1" runat="server" />
|
||||
<Swarmops5:FileUpload ID="UploadInvoiceCover" DisplayCount="1" runat="server" />
|
||||
<Swarmops5:FileUpload ID="UploadParticipantMailTemplate" DisplayCount="1" runat="server" />
|
||||
<Swarmops5:FileUpload ID="UploadOfficerMailTemplate" DisplayCount="1" runat="server" />
|
||||
<Swarmops5:FileUpload ID="UploadRenewalMailTemplate" DisplayCount="1" runat="server" />
|
||||
|
||||
@@ -19,6 +19,13 @@ namespace Swarmops.Frontend.Pages.v5.Admin
|
||||
this.InfoBoxLiteral = Resources.Pages.Admin.EditOrganization_Info;
|
||||
this.PageAccessRequired = new Access(CurrentOrganization, AccessAspect.Administration, AccessType.Write);
|
||||
|
||||
if (!Page.IsPostBack)
|
||||
{
|
||||
this.DropMembersChurn.Items.Add(new ListItem(Resources.Global.Global_SelectOne, "0"));
|
||||
}
|
||||
|
||||
// Localize();
|
||||
|
||||
this.EasyUIControlsUsed = EasyUIControl.Tabs;
|
||||
this.IncludedControlsUsed = IncludedControl.FileUpload | IncludedControl.SwitchButton;
|
||||
}
|
||||
|
||||
@@ -67,23 +67,45 @@
|
||||
list-style-type: none;
|
||||
background: white;
|
||||
border-radius: 8px;
|
||||
box-shadow: 0px 1px 4px 1px #1C397E inset;
|
||||
box-shadow: 0px 1px 4px 1px #1C397E inset, 0 1px 4px 1px #1c397e;
|
||||
|
||||
overflow:auto;
|
||||
}
|
||||
|
||||
.combo-panel > .combobox-item {
|
||||
font-size: 20px;
|
||||
padding: 0 8px;
|
||||
border-top: 1px solid transparent;
|
||||
border-bottom: 1px solid transparent;
|
||||
font-weight: lighter;
|
||||
}
|
||||
|
||||
.combo-panel > .combobox-item-selected {
|
||||
font-weight: 400;
|
||||
border-top: 1px solid #c8d9ff;
|
||||
border-bottom: 1px solid #c8d9ff;
|
||||
background: #e4ecff;
|
||||
}
|
||||
|
||||
.combo-panel > .treenode-item-selected {
|
||||
background: #e4ecff;
|
||||
}
|
||||
|
||||
.combo-panel > ul.tree > li > div.tree-node:first-child {
|
||||
padding-left: 4px;
|
||||
}
|
||||
|
||||
div.combobox-item {
|
||||
cursor: pointer;
|
||||
}
|
||||
|
||||
|
||||
/* TREE */
|
||||
|
||||
.tree
|
||||
{
|
||||
}
|
||||
|
||||
.tree-node-hover{
|
||||
.tree-node-hover, .tree-node-selected{
|
||||
background: #E4ECFF;
|
||||
box-shadow: 0px 0px 4px 1px #C8D9FF inset;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user