Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

some content styling

  • Loading branch information...
commit 3c53f3e6642e44cf64ecaaa14f33f208bd50d187 1 parent d99fe84
@Fisico Fisico authored
View
35 uptee/static/new_design/css/style.css
@@ -15,6 +15,10 @@ a:visited, a:link {
}
+.bold {
+ font-weight: bold;
+}
+
html, body {
background: url('../img/noise.png');
background-color: #EEEEEE;
@@ -410,19 +414,32 @@ html, body {
padding: 10px;
}
-/* Server Info Page */
-.content_box.off {
- border: 1px solid #ff9191;
+
+/* server info */
+
+.content h1 {
+ color: #009bff;
+ border-bottom: 1px solid #009bff;
+ font-size: 18px;
+ padding:0 0 5px 0;
+ width: 300px;
+
}
-.content_headline.off {
- background: url('../img/gradient_red.svg');
+.content table {
+ border-collapse: collapse;
}
-.content_box.on {
- border: 1px solid #009300;
+.content tr {
+ border-bottom: 1px solid #bbbbbb;
+ padding-right: 5px;
+}
+
+.content td {
+ padding: 5px 35px 5px 5px;
}
-.content_headline.on {
- background: url('../img/gradient_green.svg');
+.content .box {
+ float: left;
+ margin-right: 50px;
}
View
BIN  uptee/static/new_design/img/color_code.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
9 uptee/static/new_design/img/gradient_green.svg
@@ -1,9 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" version="1.1">
- <defs>
- <linearGradient id="g" x1="0%" y1="0%" x2="0%" y2="100%">
- <stop offset="0%" style="stop-color:rgb(240,240,240);"/>
- <stop offset="100%" style="stop-color:rgb(235,255,235);"/>
- </linearGradient>
- </defs>
- <rect width="100%" height="100%" style="fill:url(#g)"/>
-</svg>
View
9 uptee/static/new_design/img/gradient_red.svg
@@ -1,9 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" version="1.1">
- <defs>
- <linearGradient id="g" x1="0%" y1="0%" x2="0%" y2="100%">
- <stop offset="0%" style="stop-color:rgb(240,240,240);"/>
- <stop offset="100%" style="stop-color:rgb(255,225,225);"/>
- </linearGradient>
- </defs>
- <rect width="100%" height="100%" style="fill:url(#g)"/>
-</svg>
View
2  uptee/templates/new_design/mod/server_detail_base.html
@@ -108,7 +108,7 @@
{% block content %}
-<div class="content_box {% if server.is_online %}on{% else %}off{% endif %}">
+<div class="content_box">
<div class="content_headline {% if server.is_online %}on{% else %}off{% endif %}">
<h2>{{ server|get_option:'sv_name' }}</h2>
</div>
View
70 uptee/templates/new_design/mod/server_detail_info.html
@@ -18,43 +18,43 @@
{% block server_detail_content %}
-<div class="server_detail_info">
- <h2>Info</h2>
+<div class="box">
+ <h1>Info</h1>
{% if server.is_online %}<div class="server_status_update" data-serverid="{{ server.id }}">{% endif %}
<table>
<tbody>
<tr>
- <td>Owner:</td>
+ <td class="bold">Owner:</td>
<td><a href="{% url user server.owner.id %}">{% if server.owner == request.user %}You{% else %}{{ server.owner.username }}{% endif %}</a></td>
</tr>
<tr>
- <td>Mod:</td>
+ <td class="bold">Mod:</td>
<td>{{ server.mod.title }}</td>
</tr>
<tr>
- <td>Gametype:</td>
+ <td class="bold">Gametype:</td>
<td><span data-info="gametype">{% if server.server_info %}{{ server.server_info.gametype }}{% else %}{{ server|get_option:'sv_gametype' }}{% endif %}</span></td>
</tr>
<tr>
- <td>Map:</td>
+ <td class="bold">Map:</td>
<td><span data-info="map">{% if server.server_info %}{{ server.server_info.map }}{% else %}{{ server|get_option:'sv_map' }}{% if not server.map_exists %} (<span class="config_error">does not exist!</span>){% endif %}{% endif %}</span></td>
</tr>
<tr>
- <td>Slots:</td>
+ <td class="bold">Slots:</td>
<td><span data-info="slots">{% if server.server_info %}{{ server.server_info.clients|length }}/{{ server.server_info.max_clients }}{% else %}{{ server|get_option:'sv_max_clients' }}{% endif %}</span></td>
</tr>
<tr>
- <td>Password:</td>
+ <td class="bold">Password:</td>
<td><span data-info="password">{% if server.server_info %}{% if server.server_info.password %}Yes{% else %}No{% endif %}{% else %}{% if server|get_option:'password' %}Yes{% else %}No{% endif %}{% endif %}</span></td>
</tr>
{% if server.is_online %}
<tr>
- <td>Address:</td>
+ <td class="bold">Address:</td>
<td>{{ request.META.HTTP_HOST|split:':'|first }}:{{ server.port }}</td>
</tr>
{% endif %}
<tr>
- <td>Config:</td>
+ <td class="bold">Config:</td>
<td><a href="{% url config_download server.id %}">Download</a></td>
</tr>
</tbody>
@@ -62,33 +62,41 @@
{% if server.is_online %}</div>{% endif %}
</div>
-{% include "scoreboard.html" %}
-{% if server.maps.all %}
-<div class="server_detail_maplist">
- <h2>Maps</h2>
- <div class="maplist_data">
- {% for map in server.maps.all %}
- <p><a href="{% url map_details map.id %}">{{ map.name }}</a></p>
- {% endfor %}
+
+<div class="box">
+ <div class="server_detail_description">
+ <h1>Description</h1>
+ {% if user.is_authenticated and user == server.owner %}<a class="edit_link" href="{% url server_edit_description server.id %}">edit</a>{% endif %}
+ <p>
+ {% if server.description_html %}
+ {{ server.description_html|safe }}
+ {% else %}
+ No description available.
+ {% endif %}
+ </p>
</div>
</div>
-{% endif %}
-<div class="clear"></div>
+{% if user.is_authenticated and server.map_exists %}{% if user == server.owner or user.is_staff or moderator and moderator.restart_allowed %}
+
-<div class="server_detail_description">
- <h2>Description</h2>
- {% if user.is_authenticated and user == server.owner %}<a class="edit_link" href="{% url server_edit_description server.id %}">edit</a>{% endif %}
- <p>
- {% if server.description_html %}
- {{ server.description_html|safe }}
- {% else %}
- No description available.
- {% endif %}
- </p>
+{% include "scoreboard.html" %}
+
+<div class="box">
+ {% if server.maps.all %}
+ <div class="server_detail_maplist">
+ <h1>Maps</h1>
+ <div class="maplist_data">
+ {% for map in server.maps.all %}
+ <p><a href="{% url map_details map.id %}">{{ map.name }}</a></p>
+ {% endfor %}
+ </div>
+ </div>
+ {% endif %}
</div>
-{% if user.is_authenticated and server.map_exists %}{% if user == server.owner or user.is_staff or moderator and moderator.restart_allowed %}
+
+<div class="clear"></div>
<form class="only_button" method="post" action="{% url start_stop_server server.id %}?next={{ request.path }}">
<input type="hidden" name="csrfmiddlewaretoken" value="{% with csrf_token as csrf_token_clean %}{{ csrf_token_clean }}{% endwith %}">
Please sign in to comment.
Something went wrong with that request. Please try again.