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

server info and channel description

Natenom/support-murmur-13-1446181288462
Michael Ziegler 16 years ago
parent
1b2dda199b
commit
48b4ca659f
8 changed files with 136 additions and 83 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. 14
      htdocs/mumble/style.css
  2. 11
      pyweb/mumble/MumbleCtlDbus.py
  3. 7
      pyweb/mumble/MumbleCtlIce.py
  4. 3
      pyweb/mumble/mctl.py
  5. 10
      pyweb/mumble/mmobjects.py
  6. 2
      pyweb/mumble/models.py
  7. 136
      template/index.htm
  8. 36
      template/mumble/mumble.htm

14
htdocs/mumble/style.css
View File

@ -24,3 +24,17 @@ span.mumble {
float:right; float:right;
} }
div.mumble-ext {
padding: 10px;
}
div.mumble-ext ul {
list-style-type: disc;
padding-left: 20px;
}
div.mumble-ext fieldset {
border: 1px solid darkblue;
margin-top: 20px;
padding: 10px;
}

11
pyweb/mumble/MumbleCtlDbus.py
View File

@ -29,18 +29,21 @@ class MumbleCtlDbus(MumbleCtlBase):
# Prior to saving the model, connect to murmur via dbus and update its settings. # Prior to saving the model, connect to murmur via dbus and update its settings.
self.dbus_base = connstring; self.dbus_base = connstring;
self.meta = self._getDbusMeta(); self.meta = self._getDbusMeta();
def _getDbusMeta( self ): def _getDbusMeta( self ):
return dbus.Interface( dbus.SystemBus().get_object( self.dbus_base, '/' ), 'net.sourceforge.mumble.Meta' ); return dbus.Interface( dbus.SystemBus().get_object( self.dbus_base, '/' ), 'net.sourceforge.mumble.Meta' );
def _getDbusServerObject( self, srvid): def _getDbusServerObject( self, srvid):
"Connects to DBus and returns an mmServer object representing this Murmur instance." "Connects to DBus and returns an mmServer object representing this Murmur instance."
if srvid not in self.getBootedServers(): if srvid not in self.getBootedServers():
raise Exception, 'No murmur process with the given server ID (%d) is running and attached to system dbus under %s.' % ( srvid, self.meta ); raise Exception, 'No murmur process with the given server ID (%d) is running and attached to system dbus under %s.' % ( srvid, self.meta );
return dbus.Interface( dbus.SystemBus().get_object( self.dbus_base, '/%d' % srvid ), 'net.sourceforge.mumble.Murmur' ); return dbus.Interface( dbus.SystemBus().get_object( self.dbus_base, '/%d' % srvid ), 'net.sourceforge.mumble.Murmur' );
def getVersion( self ):
return MumbleCtlDbus.converDbusTypeToNative( self.meta.getVersion() )
def getAllConf(self, srvid): def getAllConf(self, srvid):
return MumbleCtlDbus.converDbusTypeToNative(self.meta.getAllConf(dbus.Int32(srvid))) return MumbleCtlDbus.converDbusTypeToNative(self.meta.getAllConf(dbus.Int32(srvid)))

7
pyweb/mumble/MumbleCtlIce.py
View File

@ -74,7 +74,10 @@ class MumbleCtlIce_118(MumbleCtlBase):
for x in self.meta.getBootedServers(): for x in self.meta.getBootedServers():
ret.append(x.id()) ret.append(x.id())
return ret return ret
def getVersion( self ):
return self.meta.getVersion();
def getAllServers(self): def getAllServers(self):
ret = [] ret = []
for x in self.meta.getAllServers(): for x in self.meta.getAllServers():
@ -263,7 +266,7 @@ class MumbleCtlIce_120(MumbleCtlIce_118):
for x in chans: for x in chans:
chan = chans[x] chan = chans[x]
ret.append([chan.id, self.setUnicodeFlag(chan.name), chan.parent, chan.links])
ret.append([chan.id, self.setUnicodeFlag(chan.name), chan.parent, chan.links, chan.description])
return ret return ret

3
pyweb/mumble/mctl.py
View File

@ -27,6 +27,9 @@ class MumbleCtlBase ():
def getAllConf(self, srvid): def getAllConf(self, srvid):
pass pass
def getVersion( self ):
pass
def setConf(self, srvid, key, value): def setConf(self, srvid, key, value):
pass pass

10
pyweb/mumble/mmobjects.py
View File

@ -42,7 +42,15 @@ class mmChannel( object ):
self.subchans = list(); self.subchans = list();
self.linked = list(); self.linked = list();
(self.chanid, self.name, parent, self.linkedIDs ) = channelObj;
self.chanid = channelObj[0];
self.name = channelObj[1];
parent = channelObj[2];
self.linkedIDs = channelObj[3];
if len( channelObj ) == 5:
self.description = channelObj[4];
else:
self.description = "";
self.parent = parentChan; self.parent = parentChan;
if self.parent is not None: if self.parent is not None:

2
pyweb/mumble/models.py
View File

@ -217,6 +217,8 @@ class Mumble( models.Model ):
return "mumble://%s%s/" % ( userstr, self.addr ); return "mumble://%s%s/" % ( userstr, self.addr );
connecturl = property( getURL, None ); connecturl = property( getURL, None );
version = property( lambda self: self.ctl.getVersion(), None );

136
template/index.htm
View File

@ -1,68 +1,68 @@
<html>
<head>
<title>Mumble Administration</title>
<meta http-equiv="Content-type" content="text/html; charset=utf-8" />
<link rel="stylesheet" type="text/css" href="/static/ext-2.2/resources/css/ext-all.css" />
<link rel="stylesheet" type="text/css" href="/static/style.css" />
<link rel="stylesheet" type="text/css" href="/static/templatestyle.css" />
<link rel="stylesheet" type="text/css" href="/static/mumble/style.css" />
<link rel="shortcut icon" type="image/png" href="/static/mumble/mumble.16x16.png" />
<script type="text/javascript" src="/static/ext-2.2/adapter/ext/ext-base.js"></script>
<script type="text/javascript" src="/static/ext-2.2/ext-all.js"></script>
{% block HeadTag %}
{% endblock %}
</head>
<body bgcolor="#3B69AD">
<div id="content">
<!-- header -->
<div id="headpanel">
<div id="headlinks">
{% if user.is_authenticated %}
<a href="/accounts/logout">Logout</a> |
{% else %}
<a href="/accounts/login">Login</a> |
{% endif %}
<a href="/admin" target="_blank">Admin</a> |
<a href="/accounts/imprint">Imprint</a>
</div>
<h2>{% block Headline %}{% endblock %}</h2>
</div>
<!-- navi -->
<div id="navipanel">
<ul id="navilinks">
<li><a href="/">Home</a></li>
{% if MumbleActive %}
<li><b>Mumble</b></li>
{% else %}
<li><a href="/mumble">Mumble</a></li>
{% endif %}
{% if ProfileActive %}
<li><b>Profile</b></li>
{% else %}
<li><a href="/accounts/profile">Profile</a></li>
{% endif %}
</ul>
</div>
<!-- content -->
<div id="contentpanel">
<div id="contentleft">
{% block LeftColumn %}
{% endblock %}
</div>
<div id="contentright">
{% block Content %}
{% endblock %}
</div>
</div>
<!-- footer -->
<div id="footerpanel">
You are using <a href="http://bitbucket.org/Svedrin/mumble-django" target="_blank">Mumble-Django</a> --
interface built using <a href="http://extjs.com/" target="_blank">ExtJS</a>
</div>
</div>
</body>
</html>
<html>
<head>
<title>Mumble Administration</title>
<meta http-equiv="Content-type" content="text/html; charset=utf-8" />
<link rel="stylesheet" type="text/css" href="/static/ext-2.2/resources/css/ext-all.css" />
<link rel="stylesheet" type="text/css" href="/static/style.css" />
<link rel="stylesheet" type="text/css" href="/static/templatestyle.css" />
<link rel="stylesheet" type="text/css" href="/static/mumble/style.css" />
<link rel="shortcut icon" type="image/png" href="/static/mumble/mumble.16x16.png" />
<script type="text/javascript" src="/static/ext-2.2/adapter/ext/ext-base.js"></script>
<script type="text/javascript" src="/static/ext-2.2/ext-all.js"></script>
{% block HeadTag %}
{% endblock %}
</head>
<body bgcolor="#3B69AD">
<div id="content">
<!-- header -->
<div id="headpanel">
<div id="headlinks">
{% if user.is_authenticated %}
<a href="/accounts/logout">Logout</a> |
{% else %}
<a href="/accounts/login">Login</a> |
{% endif %}
<a href="/admin" target="_blank">Admin</a> |
<a href="/accounts/imprint">Imprint</a>
</div>
<h2>{% block Headline %}{% endblock %}</h2>
</div>
<!-- navi -->
<div id="navipanel">
<ul id="navilinks">
<li><a href="/">Home</a></li>
{% if MumbleActive %}
<li><b>Mumble</b></li>
{% else %}
<li><a href="/mumble">Mumble</a></li>
{% endif %}
{% if ProfileActive %}
<li><b>Profile</b></li>
{% else %}
<li><a href="/accounts/profile">Profile</a></li>
{% endif %}
</ul>
</div>
<!-- content -->
<div id="contentpanel">
<div id="contentleft">
{% block LeftColumn %}
{% endblock %}
</div>
<div id="contentright">
{% block Content %}
{% endblock %}
</div>
</div>
<!-- footer -->
<div id="footerpanel">
You are using <a href="http://bitbucket.org/Svedrin/mumble-django" target="_blank">Mumble-Django</a> --
interface built using <a href="http://extjs.com/" target="_blank">ExtJS</a>
</div>
</div>
</body>
</html>

36
template/mumble/mumble.htm
View File

@ -16,7 +16,20 @@
</p> </p>
</noscript> </noscript>
<div id="mumble_ext_container"></div> <div id="mumble_ext_container"></div>
<div id="mumble_registration">
<div id="mumble_motd" class="mumble-ext x-hide-display">
<ul>
<li>Server address: <a href="{{ DBaseObject.connecturl }}">{{ DBaseObject.addr }}:{{ DBaseObject.port }}</a></li>
{% if DBaseObject.url %}
<li>Website: {{ DBaseObject.url|urlize }}</li>
{% endif %}
<li>Server version: {{ DBaseObject.version.0 }}.{{ DBaseObject.version.1 }}.{{ DBaseObject.version.2 }}</li>
</ul>
<fieldset>
<legend>Welcome message</legend>
{{ DBaseObject.motd|safe }}
</fieldset>
</div>
<div id="mumble_registration" class="mumble-ext">
{% if user.is_authenticated %} {% if user.is_authenticated %}
<h2>Server registration</h2> <h2>Server registration</h2>
<form action="" method="post"> <form action="" method="post">
@ -37,7 +50,7 @@
</div> </div>
{% if Registered %} {% if Registered %}
<div id="mumble_texture">
<div id="mumble_texture" class="mumble-ext">
<h2>User Texture</h2> <h2>User Texture</h2>
<p> <p>
You can upload an image that you would like to use as your user texture here.<br /> You can upload an image that you would like to use as your user texture here.<br />
@ -57,7 +70,7 @@
{% endif %} {% endif %}
{% if CurrentUserIsAdmin %} {% if CurrentUserIsAdmin %}
<div id="mumble_admin">
<div id="mumble_admin" class="mumble-ext">
<h2>Server administration</h2> <h2>Server administration</h2>
<form action="" method="post"> <form action="" method="post">
<table> <table>
@ -71,7 +84,7 @@
{% for item in ChannelTable %} {% for item in ChannelTable %}
{% if item.is_player %} {% if item.is_player %}
<div id="mumble_{{ item.id }}" class="x-hide-display">
<div id="mumble_{{ item.id }}" class="mumble-ext x-hide-display">
<h2>Player {{ item.name }}</h2> <h2>Player {{ item.name }}</h2>
<ul> <ul>
<li>Online since {{item.onlinesince|time:"H:i"}}</li> <li>Online since {{item.onlinesince|time:"H:i"}}</li>
@ -94,9 +107,15 @@
{% endif %} {% endif %}
</div> </div>
{% else %} {% else %}
<div id="mumble_{{ item.id }}" class="x-hide-display">
<div id="mumble_{{ item.id }}" class="mumble-ext x-hide-display">
<h2>Channel {{ item.name }}</h2> <h2>Channel {{ item.name }}</h2>
<a href="{{ item|chanurl:MumbleAccount }}" class="mumble">Connect</a> <a href="{{ item|chanurl:MumbleAccount }}" class="mumble">Connect</a>
{% if item.description %}
<fieldset>
<legend>Channel description</legend>
{{ item.description|safe }}
</fieldset>
{% endif %}
</div> </div>
{% endif %} {% endif %}
{% endfor %} {% endfor %}
@ -117,7 +136,7 @@
renderTo: 'mumble_ext_container', renderTo: 'mumble_ext_container',
layout: 'card', layout: 'card',
id: 'mumble_container', id: 'mumble_container',
height: 550,
height: 570,
activeItem: 0, activeItem: 0,
border: false, border: false,
items: [ { items: [ {
@ -126,12 +145,13 @@
defaults: { autoheight: true }, defaults: { autoheight: true },
activeTab: {{ DisplayTab }}, activeTab: {{ DisplayTab }},
items: [ items: [
{ contentEl: 'mumble_motd', title: 'Server Info', autoScroll: true },
{ contentEl: 'mumble_registration', title: 'Registration', autoScroll: true }, { contentEl: 'mumble_registration', title: 'Registration', autoScroll: true },
{% if CurrentUserIsAdmin %} {% if CurrentUserIsAdmin %}
{ contentEl: 'mumble_admin', title: 'Administration', autoScroll: true },
{ contentEl: 'mumble_admin', title: 'Administration', autoScroll: true },
{% endif %} {% endif %}
{% if Registered %} {% if Registered %}
{ contentEl: 'mumble_texture', title: 'User Texture', autoScroll: true },
{ contentEl: 'mumble_texture', title: 'User Texture', autoScroll: true },
{% endif %} {% endif %}
] ]
}, },

Write Preview
Loading…
Cancel
Save