warricksothr
/
mumble-django
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
Browse Source

restructure the code a little by outsourcing various elements into their own objects

Natenom/support-murmur-13-1446181288462
Michael Ziegler 15 years ago
parent
78d4851a94
commit
f342d46b2a
5 changed files with 296 additions and 241 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 66
      htdocs/js/buttoniframewindow.js
  2. 86
      htdocs/js/loginout_buttons.js
  3. 67
      htdocs/js/logviewer.js
  4. 6
      htdocs/js/usereditor.js
  5. 220
      pyweb/mumble/templates/mumble/mumble.html

66
htdocs/js/buttoniframewindow.js
View File

@ -0,0 +1,66 @@
// kate: space-indent on; indent-width 4; replace-tabs on;
Ext.namespace('Ext.ux');
Ext.ux.IFrameComponent = Ext.extend(Ext.BoxComponent, {
// http://www.extjs.com/forum/showthread.php?p=54416#post54416
onRender : function(ct, position){
this.el = ct.createChild({tag: 'iframe', id: 'iframe-'+ this.id, frameBorder: 0, src: this.url});
}
});
Ext.ux.ButtonIframeWindow = function( config ){
Ext.apply( this, config );
Ext.apply( this, {
scope: this,
enableToggle: true,
toggleHandler: function(button, state){
if( !this.wnd ){
this.wnd = new Ext.Window({
title: this.windowTitle || this.text,
layout: 'fit',
items: new Ext.ux.IFrameComponent({ url: this.url }),
width: window.viewsize.width - 200,
height: window.viewsize.height - 100,
scope: this,
buttons: [{
text: gettext('Open in new window'),
scope: this,
handler: function(){
window.open( this.url );
this.toggle( false );
}
}],
listeners: {
beforeclose: function(){
this.toggle( false, false );
this.wnd = null;
}
},
});
this.wnd.ownerButton = this;
}
if( state ){
this.wnd.show();
mypos = this.getPosition();
mysize = this.getSize();
winsize = this.wnd.getSize();
this.wnd.setPosition(
mypos[0] + mysize.width - winsize.width,
mypos[1] - winsize.height
);
}
else
this.wnd.hide();
}
});
Ext.ux.ButtonIframeWindow.superclass.constructor.call( this );
}
Ext.extend( Ext.ux.ButtonIframeWindow, Ext.Button, {
} );
Ext.reg( 'buttonIframeWindow', Ext.ux.ButtonIframeWindow );

86
htdocs/js/loginout_buttons.js
View File

@ -0,0 +1,86 @@
// kate: space-indent on; indent-width 4; replace-tabs on;
Ext.namespace('Ext.ux');
Ext.ux.ButtonLogout = Ext.extend(Ext.Button, {
text: gettext('Logout'),
handler: function(){
Accounts.logout( function(provider, response){
if( response.result.success ){
window.location.reload();
}
else{
Ext.Msg.show({
title: gettext("Login error"),
msg: gettext("Unable to log out."),
icon: Ext.MessageBox.ERROR,
buttons: Ext.MessageBox.OK
});
}
} );
}
});
Ext.ux.ButtonLogin = Ext.extend(Ext.Button, {
text: gettext('Login'),
enableToggle: true,
toggleHandler: function(button, state){
if( !this.wnd ){
this.wnd = new Ext.Window({
title: gettext('Login'),
closable: false,
width: 300,
height: 130,
layout: 'fit',
items: {
layout: 'form',
border: false,
defaults: { anchor: '-20px' },
buttons: [{
text: gettext('Submit'),
handler: function(){
form = this.ownerCt.ownerCt.items.items;
Accounts.login(form[0].getValue(), form[1].getValue(),
function(provider, response){
if( response.result.success ){
window.location.reload();
}
else{
Ext.Msg.show({
title: gettext("Login error"),
msg: gettext("Unable to log in."),
icon: Ext.MessageBox.ERROR,
buttons: Ext.MessageBox.OK
});
}
});
}
}],
items: [{
xtype: "textfield",
width: 50,
fieldLabel: gettext("User name"),
name: "username"
}, {
xtype: 'textfield',
fieldLabel: gettext("Password"),
inputType: "password",
name: "password"
}],
},
});
}
if( state ){
this.wnd.show();
mypos = this.getPosition();
mysize = this.getSize();
winsize = this.wnd.getSize();
this.wnd.setPosition(
mypos[0] + mysize.width - winsize.width,
mypos[1] - winsize.height
);
}
else
this.wnd.hide();
}
});

67
htdocs/js/logviewer.js
View File

@ -0,0 +1,67 @@
// kate: space-indent on; indent-width 4; replace-tabs on;
Ext.namespace('Ext.ux');
Ext.ux.LogViewerPanel = function( config ){
Ext.apply( this, config );
Ext.applyIf( this, {
xtype: 'grid',
title: gettext('Log messages'),
colModel: new Ext.grid.ColumnModel([{
header: gettext('Timestamp'),
dataIndex: 'timestamp',
width: 100,
renderer: function( value ){
return new Date(value*1000).format( "Y-m-d H:i:s" );
}
}, {
header: gettext('Log entry'),
width: 500,
dataIndex: 'txt'
}]),
bbar: [{
text: gettext('Filter') + ':'
}, {
xtype: 'textfield',
name: 'filter',
listeners: {
render: function(c) {
Ext.QuickTips.register({
target: c.getEl(),
text: gettext('Enter a string to filter the logs by and press Enter. To display all log entries, empty this field.')
});
},
specialkey: function( field, ev ){
if( ev.getKey() == ev.ENTER ){
field.ownerCt.ownerCt.store.baseParams.filter = field.getValue();
field.ownerCt.ownerCt.store.reload();
}
}
}
}, '-', {
iconCls: 'x-tbar-loading',
tooltip: gettext('Refresh'),
handler: function(){
this.ownerCt.ownerCt.store.reload();
}
}],
store: new Ext.data.DirectStore({
baseParams: {'server': this.server, 'start': 0, 'limit': 100, 'filter': ''},
directFn: Mumble.log,
paramOrder: ['server', 'start', 'limit', 'filter'],
root: 'data',
fields: ['timestamp', 'txt'],
autoLoad: true,
remoteSort: false
}),
viewConfig: { forceFit: true }
});
Ext.ux.LogViewerPanel.superclass.constructor.call( this );
}
Ext.extend( Ext.ux.LogViewerPanel, Ext.grid.EditorGridPanel, {
} );
Ext.reg( 'logViewerPanel', Ext.ux.LogViewerPanel );

6
htdocs/js/usereditor.js
View File

@ -1,8 +1,4 @@
// {% load mumble_extras %}
// {% load i18n %}
// {% comment %}
// kate: space-indent on; indent-width 2; replace-tabs on; // kate: space-indent on; indent-width 2; replace-tabs on;
// {% endcomment %}
Ext.namespace('Ext.ux'); Ext.namespace('Ext.ux');
@ -19,7 +15,7 @@ Ext.ux.UserEditorPanel = function( config ){
]); ]);
userAdminStore = new Ext.data.DirectStore({ userAdminStore = new Ext.data.DirectStore({
baseParams: { server: 1 },
baseParams: { server: this.server },
directFn: Mumble.users, directFn: Mumble.users,
fields: userRecord, fields: userRecord,
autoLoad: true, autoLoad: true,

220
pyweb/mumble/templates/mumble/mumble.html
View File

@ -13,147 +13,35 @@
<script type="text/javascript" src="/mumble/forms/mumbleform.js"></script> <script type="text/javascript" src="/mumble/forms/mumbleform.js"></script>
<script type="text/javascript" src="{{ MEDIA_URL }}/js/channelviewer.js"></script> <script type="text/javascript" src="{{ MEDIA_URL }}/js/channelviewer.js"></script>
<script type="text/javascript" src="{{ MEDIA_URL }}/js/usereditor.js"></script> <script type="text/javascript" src="{{ MEDIA_URL }}/js/usereditor.js"></script>
<script type="text/javascript" src="{{ MEDIA_URL }}/js/logviewer.js"></script>
<script type="text/javascript" src="{{ MEDIA_URL }}/js/buttoniframewindow.js"></script>
<script type="text/javascript" src="{{ MEDIA_URL }}/js/loginout_buttons.js"></script>
<script type="text/javascript"> <script type="text/javascript">
Ext.ux.IFrameComponent = Ext.extend(Ext.BoxComponent, {
// http://www.extjs.com/forum/showthread.php?p=54416#post54416
onRender : function(ct, position){
this.el = ct.createChild({tag: 'iframe', id: 'iframe-'+ this.id, frameBorder: 0, src: this.url});
}
});
Ext.onReady( function(){
Ext.QuickTips.init();
viewsize = { viewsize = {
width: Ext.lib.Dom.getViewWidth(), width: Ext.lib.Dom.getViewWidth(),
height: Ext.lib.Dom.getViewHeight() height: Ext.lib.Dom.getViewHeight()
}; };
var mainpanel = new Ext.Panel({
Ext.onReady( function(){
Ext.QuickTips.init();
mainpanel = new Ext.Panel({
renderTo: document.body, renderTo: document.body,
height: viewsize.height, height: viewsize.height,
layout: "border", layout: "border",
title: "{{ MumbleServer.name }}", title: "{{ MumbleServer.name }}",
buttons: [ buttons: [
{% if user.is_staff %}{
text: gettext('Admin'),
enableToggle: true,
toggleHandler: function(button, state){
if( !this.wnd ){
this.wnd = new Ext.Window({
title: gettext('Administration'),
layout: 'fit',
items: new Ext.ux.IFrameComponent({ url: '/admin' }),
width: viewsize.width - 200,
height: viewsize.height - 100,
buttons: [{
text: gettext('Open in new window'),
handler: function(){
window.open( '/admin' );
this.ownerCt.ownerCt.ownerButton.toggle( false );
}
}],
listeners: {
beforeclose: function(){
this.ownerButton.toggle( false, false );
this.ownerButton.wnd = null;
}
},
});
this.wnd.ownerButton = this;
}
if( state ){
this.wnd.show();
mypos = this.getPosition();
mysize = this.getSize();
winsize = this.wnd.getSize();
this.wnd.setPosition(
mypos[0] + mysize.width - winsize.width,
mypos[1] - winsize.height
);
}
else
this.wnd.hide();
},
}, {% endif %}
{% if user.is_authenticated %}{
text: gettext('Logout'),
handler: function(){
Accounts.logout( function(provider, response){
if( response.result.success ){
window.location.reload();
}
else{
Ext.Msg.show({
title: gettext("Login error"),
msg: gettext("Unable to log out."),
icon: Ext.MessageBox.ERROR,
buttons: Ext.MessageBox.OK
});
}
} );
}
} {% else %} {
text: gettext('Login'),
enableToggle: true,
toggleHandler: function(button, state){
if( !this.wnd ){
this.wnd = new Ext.Window({
title: gettext('Login'),
closable: false,
width: 300,
height: 130,
layout: 'fit',
items: {
layout: 'form',
border: false,
defaults: { anchor: '-20px' },
buttons: [{
text: gettext('Submit'),
handler: function(){
form = this.ownerCt.ownerCt.items.items;
Accounts.login(form[0].getValue(), form[1].getValue(),
function(provider, response){
if( response.result.success ){
window.location.reload();
}
else{
Ext.Msg.show({
title: gettext("Login error"),
msg: gettext("Unable to log in."),
icon: Ext.MessageBox.ERROR,
buttons: Ext.MessageBox.OK
});
}
});
}
}],
items: [{
xtype: "textfield",
width: 50,
fieldLabel: gettext("User name"),
name: "username"
}, {
xtype: 'textfield',
fieldLabel: gettext("Password"),
inputType: "password",
name: "password"
}],
},
});
}
if( state ){
this.wnd.show();
mypos = this.getPosition();
mysize = this.getSize();
winsize = this.wnd.getSize();
this.wnd.setPosition(
mypos[0] + mysize.width - winsize.width,
mypos[1] - winsize.height
);
}
else
this.wnd.hide();
{% if user.is_staff %}
{
xtype: 'buttonIframeWindow',
text: gettext('Administration'),
url: '/admin',
}, },
} {% endif %}
{% endif %}
{% if user.is_authenticated %}
new Ext.ux.ButtonLogout()
{% else %}
new Ext.ux.ButtonLogin()
{% endif %}
], ],
items: [{ items: [{
xtype: "mumblechannelviewer", xtype: "mumblechannelviewer",
@ -175,12 +63,14 @@
}, },
}, },
{% if MumbleAccount %} {% if MumbleAccount %}
{% if IsAdmin %} {
{% if IsAdmin %}
{
title: gettext("Administration"), title: gettext("Administration"),
pk: {{ MumbleServer.id }}, pk: {{ MumbleServer.id }},
labelWidth: 150, labelWidth: 150,
xtype: 'mumbleform', xtype: 'mumbleform',
}, {% endif %}
},
{% endif %}
{ {
title: gettext("User texture"), title: gettext("User texture"),
layout: "border", layout: "border",
@ -222,67 +112,17 @@
}], }],
}], }],
}, },
{% if IsAdmin %} {
xtype: "userEditorPanel",
}, {% endif %}
{% if IsAdmin %}
{ {
xtype: 'grid',
title: gettext('Log messages'),
colModel: new Ext.grid.ColumnModel([{
header: gettext('Timestamp'),
dataIndex: 'timestamp',
width: 100,
renderer: function( value ){
return new Date(value*1000).format( "Y-m-d H:i:s" );
}
}, {
header: gettext('Log entry'),
width: 500,
dataIndex: 'txt'
}]),
bbar: [{
text: gettext('Filter') + ':'
xtype: "userEditorPanel",
server: {{ MumbleServer.id }}
}, { }, {
xtype: 'textfield',
name: 'filter',
listeners: {
render: function(c) {
Ext.QuickTips.register({
target: c.getEl(),
text: gettext('Enter a string to filter the logs by and press Enter. To display all log entries, empty this field.')
});
},
specialkey: function( field, ev ){
if( ev.getKey() == ev.ENTER ){
field.ownerCt.ownerCt.store.baseParams.filter = field.getValue();
field.ownerCt.ownerCt.store.reload();
}
xtype: 'logViewerPanel',
server: {{ MumbleServer.id }}
} }
}
}, '-', {
iconCls: 'x-tbar-loading',
handler: function(){
this.ownerCt.ownerCt.store.reload();
}
}],
store: new Ext.data.DirectStore({
baseParams: {'server': 1, 'start': 0, 'limit': 100, 'filter': ''},
directFn: Mumble.log,
paramOrder: ['server', 'start', 'limit', 'filter'],
paramsNames: {
start: 'start',
limit: 'limit',
sort: 'sort',
dir: 'dir'
},
root: 'data',
fields: ['timestamp', 'txt'],
autoLoad: true,
remoteSort: false
}),
viewConfig: { forceFit: true }
}
{% endif %} ],
{% endif %}
{% endif %}
],
}], }],
}); });
} ); } );

Write Preview
Loading…
Cancel
Save