github/reddit
1
1
Fork 0
mirror of https://github.com/reddit-archive/reddit.git synced 2026-01-27 15:58:06 -05:00
Code Issues Packages Projects Releases Wiki Activity

Remove unused admin sidebar. Show everyone app id.

Browse Source
This commit is contained in:
Neil Williams
2011-09-20 08:59:25 -07:00
parent 3735033907
commit e576b3c500
5 changed files with 1 additions and 380 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
r2/r2/lib/pages/pages.py
View File

@@ -277,9 +277,6 @@ class Reddit(Templated):
if c.user.pref_show_adbox or not c.user.gold:
ps.append(Ads())
if c.user_is_admin:
ps.append(Admin_Rightbox())
if c.user.pref_clickgadget and c.recent_clicks:
ps.append(SideContentBox(_("Recently viewed links"),
[ClickGadget(c.recent_clicks)]))
@@ -2228,9 +2225,6 @@ class AdminUsage(Templated):
class Ads(Templated):
pass
class Admin_Rightbox(Templated):
pass
class Embed(Templated):
"""wrapper for embedding /help into reddit as if it were not on a separate wiki."""
def __init__(self,content = ''):

67
r2/r2/public/static/css/reddit.css
View File

@@ -1362,73 +1362,6 @@ textarea.gray { color: gray; }
font-size: larger;
}
.server-status { width: 300px; }
.server-status table {
font-size: xx-small;
margin-left: 5px;
border-top: #BCBCBC solid 1px;
border-left: #BCBCBC solid 1px;
border-bottom: #E0E0E0 solid 1px;
border-right: #E0E0E0 solid 1px;
margin-bottom: 5px;
width: 290px;
}
.server-status td { padding-right: 2px; padding-left: 2px; }
.server-status .bar { height: 5px; background-color: blue; }
.load0 { background-color: #FFFFFF; } /* white */
.load1 { background-color: #f0f5FF; } /* pale blue */
.load2 { background-color: #E2ECFF; } /* blue */
.load3 { background-color: #d6f5cb; } /* pale green */
.load4 { background-color: #CAFF98; } /* green */
.load5 { background-color: #e4f484; } /* yellowgreen */
.load6 { background-color: #FFEA71; } /* orange */
.load7 { background-color: #ffdb81; } /* orangerose */
.load8 { background-color: #FF9191; } /* pink */
.load9 { background-color: #FF0000; color: #FFFFFF } /* red */
.server-status tr.down > * {
background-color: #C0C0C0;
text-decoration: line-through;
}
.server-status th { font-weight: bold; padding-right: 2px; }
.server-status tr.title-region { cursor: pointer; }
.server-status tr.title-region:hover > td,
.server-status tr.title-region:hover > th { text-decoration: underline; }
.server-status tr.title-region.empty { cursor: default; opacity: 0.7; }
.server-status tr.title-region.empty:hover > td,
.server-status tr.title-region.empty:hover > th { text-decoration: none; }
.server-status .pegged {
background-color: red;
font-weight: bold;
color: #FFFFFF;
}
.server-status .membar {
height:11px;
border:1px solid white;
background-color:#6699FF;
position: relative;
}
.server-status .membar span {
position: absolute;
font-size: smaller;
}
.server-status .cpu50 {
height: 5px;
background-color:green;
border:1px solid white;
border-bottom: none;
}
.server-status .cpu300 {
height: 5px;
background-color:red;
border:1px solid white;
}
/* login form */
.orangered { color: orangered; }

29
r2/r2/templates/admin_rightbox.html
View File

@@ -1,29 +0,0 @@
## The contents of this file are subject to the Common Public Attribution
## License Version 1.0. (the "License"); you may not use this file except in
## compliance with the License. You may obtain a copy of the License at
## http://code.reddit.com/LICENSE. The License is based on the Mozilla Public
## License Version 1.1, but Sections 14 and 15 have been added to cover use of
## software over a computer network and provide for limited attribution for the
## Original Developer. In addition, Exhibit A has been modified to be consistent
## with Exhibit B.
##
## Software distributed under the License is distributed on an "AS IS" basis,
## WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License for
## the specific language governing rights and limitations under the License.
##
## The Original Code is Reddit.
##
## The Original Developer is the Initial Developer. The Initial Developer of
## the Original Code is CondeNet, Inc.
##
## All portions of the code written by CondeNet are Copyright (c) 2006-2010
## CondeNet, Inc. All Rights Reserved.
################################################################################
<%
from r2.lib.services import AppServiceMonitor
%>
%if c.user_is_admin:
${AppServiceMonitor()}
%endif

278
r2/r2/templates/appservicemonitor.html
View File

@@ -1,278 +0,0 @@
## The contents of this file are subject to the Common Public Attribution
## License Version 1.0. (the "License"); you may not use this file except in
## compliance with the License. You may obtain a copy of the License at
## http://code.reddit.com/LICENSE. The License is based on the Mozilla Public
## License Version 1.1, but Sections 14 and 15 have been added to cover use of
## software over a computer network and provide for limited attribution for the
## Original Developer. In addition, Exhibit A has been modified to be consistent
## with Exhibit B.
##
## Software distributed under the License is distributed on an "AS IS" basis,
## WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License for
## the specific language governing rights and limitations under the License.
##
## The Original Code is Reddit.
##
## The Original Developer is the Initial Developer. The Initial Developer of
## the Original Code is CondeNet, Inc.
##
## All portions of the code written by CondeNet are Copyright (c) 2006-2010
## CondeNet, Inc. All Rights Reserved.
################################################################################
<%
import datetime
cpu_col = 75.
mem_col = 40.
hide_data = "style='display:none'" if len(thing.hostlogs) > 4 else ''
# default number of color coding levels (to match reddit.css)
def get_load_level(host, nlevels = 8):
# default number of cpus shall be 1
ncpus = getattr(host, "ncpu", 1)
# color code in nlevel levels
return _load_int(host.load(), ncpus, nlevels = 8)
def _load_int(current, max_val, nlevels = 8):
return min(max(int(nlevels*current/max_val+0.4), 0),nlevels+1)
%>
<div class="server-status">
<h3>Rendered by PID ${g.reddit_pid} on ${g.reddit_host} running ${g.short_version}</h3>
<table>
%for cache in ("memcaches", "rendercaches"):
<%
cache_lifetime = thing.get_cache_lifetime(key = cache)
if cache_lifetime > 0:
cache_lifetime = '%s' % datetime.timedelta(0, max(cache_lifetime, 0))
else:
cache_lifetime = "--:--.--"
%>
<tr>
<th>${cache} lifetime:</th>
<td>${'%s' % cache_lifetime}</td>
</tr>
%endfor
</table>
%if any(getattr(h, "queue", None) for h in thing.hostlogs):
<table class="process-monitor">
<tr>
<th>queue</th>
<th>length</th>
</tr>
%for host in thing.hostlogs:
%if host.queue:
<tr>
<th colspan="2"></th>
</tr>
%for name, data in host.queue:
<%
length = data()
max_len = host.queue.max_length(name)
load_level = _load_int(length, max_len)
%>
<tr class="load${load_level} title-region">
<td>${name}</td>
<td>${length} / ${max_len}</td>
</tr>
%endfor
%endif
%endfor
</table>
%endif
%if any(h.database for h in thing.hostlogs):
<table class="monitor-database">
<tr class="title-region">
<th>database</th>
<th>disk</th>
<th>conn</th>
<th></th>
</tr>
%for host in thing.hostlogs:
%if host.database:
<%
host_id = host.host.replace('.', '-')
load = host.load()
load_level = get_load_level(host)
if hasattr(host.database, "disk_usage"):
du = host.database.disk_usage
else:
du = 0;
du_wid = int(cpu_col*min(1, du))
if host.database.max_connections > 0:
max_conn = host.database.max_connections
conn = float(host.database.connections()) / max_conn
else:
max_conn = conn = 0
%>
<tr class="load${load_level} title-region" id="${host_id}">
<th>
${host.host} load: ${load}
</th>
<th width="${cpu_col}px">
%if host.database.vacuuming:
<blink style="color:red">VACUUMING!</blink>
%else:
<div class="membar" style="width:${du_wid}px;">
<span>
${"%3.0f%%" % (100 * du) }
</span>
</div>
%endif
</th>
<td>
<span style="color:green">${int(conn * max_conn)}</span>
&nbsp;/&nbsp;
<span>${max_conn}</span>
%if hasattr(host.database, "last_update"):
<% update = host.database.last_update() %>
%if not update or update > datetime.timedelta(0, 60):
<b style="color:orangered; font-size:smaller">
(${str(update).split('.')[0]} old)
</b>
%endif
%endif
</td>
</tr>
<%
qcount = host.database.query_count \
if hasattr(host.database, "query_count") else None
%>
%if qcount and qcount():
<tr class="load${load_level} title-region" id="${host_id}">
<th>
</th>
<th>
query count:
</th>
<td>
<span style="color:green">${qcount()}</span>
&nbsp;/&nbsp;
<span style="color:red">${qcount(300)}</span>
</td>
</tr>
%endif
<tr ${hide_data} class="data load${load_level} machine-${host_id}">
<th>by ip:</th>
<td></td><td></td>
</tr>
%for ip, nconn in host.database.ip_conn.iteritems():
<tr ${hide_data}
class="data load${load_level} machine-${host_id} by-ip">
<td>
${ip}
</td>
<td></td>
<td>
${nconn()}
</td>
</tr>
%endfor
<tr ${hide_data} class="data load${load_level} machine-${host_id} by-ip">
<th>by database:</th>
<td></td><td></td>
</tr>
%for db, nconn in host.database.db_conn.iteritems():
<tr ${hide_data} class="data load${load_level} machine-${host_id} by-db">
<td>
${db}
</td>
<td>
%if db in host.database.vacuuming:
<blink style="color:red">VACUUMING!</blink>
%endif
</td>
<td>
${nconn()}
</td>
</tr>
%endfor
%endif
%endfor
</table>
%endif
<table class="process-monitor">
<tr>
<th>process</th>
<th>memory</th>
<th>
<span style="color:green">1 min</span> /
<span style="color:red">5 min</span>
</th>
<th></th>
</tr>
%for host in thing.hostlogs:
<%
host_id = host.host.replace('.', '-')
load = host.load()
load_level = get_load_level(host)
%>
%if len(host.services):
<tr class="load${load_level} title-region" id="${host_id}">
<th>
${host.host} load: ${load}
</th>
<td></td>
<td></td>
<td></td>
</tr>
%for service in host:
<%
pegged = all([service.cpu(x) > 99 \
for x in (0, 5, 60, 300)]) or \
(service.mem() >= 20)
pegged = "pegged" if pegged else ""
mem_wid = int(mem_col/25*min(25, int(service.mem())))
cpu_60_wid = int(cpu_col/100*min(100,int(service.cpu(60))))
cpu_300_wid = int(cpu_col/100*min(100,int(service.cpu(300))))
is_down = 'down' if service.pid < 0 else ''
%>
<tr ${hide_data}
class="data load${load_level} ${pegged} ${is_down} machine-${host_id}">
<td>
%if g.reddit_host == host.host and g.reddit_pid == service.pid:
<b style="color:orangered; font-size:larger">&raquo;</b>
%else:
&nbsp;
%endif
${service.name}
</td>
<td>
<div class="membar" style="width:${mem_wid}px;"></div>
</td>
<td>
<div class="cpu50" style="width:${cpu_60_wid}px;"></div>
<div class="cpu300" style="width:${cpu_300_wid}px;"></div>
</td>
<td>
<%
age = service.age
if isinstance(age, str):
age = 0
if age > 60:
age = "%d hr" % int(age/60)
else:
age = "%d min" % age
%>
${age if service.pid > 0 else 'down'}
</td>
</tr>
%endfor
%endif
%endfor
</table>
</div>
<script type="text/javascript">
$(".server-status tr").click(function() {
if(!$(this).hasClass("data")) {
$(this).siblings(".machine-"+ $(this).attr("id")).toggle();
}
});
</script>

1
r2/r2/templates/redditfooter.html
View File

@@ -54,4 +54,5 @@
dict(year=datetime.datetime.now().timetuple()[0])}
</p>
<p class="bottommenu">REDDIT and the ALIEN Logo are registered trademarks of Advance Magazine Publishers Inc.</p>
<p class="bottommenu">Rendered by PID ${g.reddit_pid} on ${g.reddit_host} running ${g.short_version}.</p>
</div>