burmatovan/openuds
1
0
Fork 0
forked from shaba/openuds
Code Issues Pull Requests Projects Releases Wiki Activity

* added popover on small names

Browse Source 
* moved deployed services names under lauchn button
This commit is contained in:
Adolfo Gómez 2013-11-09 09:11:15 +00:00
parent bfed62d833
commit 2bda255c2a
6 changed files with 40 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
server/.settings/org.eclipse.core.resources.prefs
View File

@ -83,6 +83,7 @@ encoding//src/uds/core/ui/theme.py=utf-8
encoding//src/uds/core/util/AutoAttributes.py=utf-8
encoding//src/uds/core/util/Cache.py=utf-8
encoding//src/uds/core/util/Config.py=utf-8
encoding//src/uds/core/util/Decorators.py=utf-8
encoding//src/uds/core/util/OsDetector.py=utf-8
encoding//src/uds/core/util/State.py=utf-8
encoding//src/uds/core/util/StateQueue.py=utf-8

34
server/src/uds/core/util/Decorators.py
View File

@ -1,8 +1,36 @@
'''
Created on Feb 6, 2012
# -*- coding: utf-8 -*-
#
# Copyright (c) 2012 Virtual Cable S.L.
# All rights reserved.
#
# Redistribution and use in source and binary forms, with or without modification,
# are permitted provided that the following conditions are met:
#
# * Redistributions of source code must retain the above copyright notice,
# this list of conditions and the following disclaimer.
# * Redistributions in binary form must reproduce the above copyright notice,
# this list of conditions and the following disclaimer in the documentation
# and/or other materials provided with the distribution.
# * Neither the name of Virtual Cable S.L. nor the names of its contributors
# may be used to endorse or promote products derived from this software
# without specific prior written permission.
#
# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
# AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
# DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
# FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
# SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
# CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
# OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
@author: dkmaster
'''
@author: Adolfo Gómez, dkmaster at dkmon dot com
'''
from __future__ import unicode_literals
from time import sleep
from functools import wraps

8
server/src/uds/static/css/uds-html5.css
View File

@ -28,9 +28,9 @@ footer {
}
#transport {
margin-top: 32px;
margin-bottom: 32px;
.transport {
width: 48px;
height: 48px;
}
/* Sample "info" (footer) text, to be placed after (c) Virtualcable */
@ -110,7 +110,7 @@ footer {
.form-preferences legend {
margin-top: 20px;
padding-left: 16px;
background-color: #f7f7f7;
background-color: #e7e7e7;
-moz-box-shadow: 0px 2px 2px rgba(0, 0, 0, 0.3);
-webkit-box-shadow: 0px 2px 2px rgba(0, 0, 0, 0.3);
box-shadow: 0px 2px 2px rgba(0, 0, 0, 0.3);

6
server/src/uds/templates/uds/html5/index.html
View File

@ -39,7 +39,7 @@
});
{% endif %}
$(".btn-default").tooltip({container: 'body', placement: 'bottom'});
$('.transport-caption-small').popover({container: 'body', trigger: 'hover', delay: { show: 500, hide: 100 }, placement: 'auto bottom'});
});
</script>
{% endblock %}
@ -55,8 +55,7 @@
href="{% url "uds.web.views.service" idService=ser.id idTransport=trans.id %}"
title="{{ ser.name }}"
data-toggle="tooltip">
<div><img src="{% url "uds.web.views.transportIcon" idTrans=trans.id %}" class="" alt="{{ ser.name }}" /></div>
<div>{{ ser.name|truncatechars:12 }}</div>
<img src="{% url "uds.web.views.transportIcon" idTrans=trans.id %}" class="transport" alt="{{ ser.name }}" />
</a>
{% if numTransports > 1 %}
<button type="button" class="btn list-btn btn-default dropdown-toggle list-dropdown-toggle" data-toggle="dropdown">
@ -71,6 +70,7 @@
{% endfor %}
</ul>
{% endif %}
<div class="transport-caption{% if ser.name|length > 16 %}-small{% endif %} text-center" data-content="{{ser.name|capfirst}}">{{ ser.name|capfirst|truncatechars:16 }}</div>
</div>
{% endwith %}
{% endif %}

1
server/src/uds/urls.py
View File

@ -64,6 +64,7 @@ urlpatterns = patterns('uds',
(r'^authJava/(?P<idAuth>.+)/(?P<hasJava>.*)$', 'web.views.authJava'),
(r'^authinfo/(?P<authName>.+)', 'web.views.authInfo'),
(r'^about', 'web.views.about'),
(r'^about', 'web.views.about'),
)

1
server/src/uds/web/views.py
View File

@ -1,5 +1,4 @@
# -*- coding: utf-8 -*-
#
# Copyright (c) 2012 Virtual Cable S.L.
# All rights reserved.