Minor UI enhancements
* Removed unused styles * 'More' button is added to module activity log * Formatter for commit message is improved Closes bug 1214360 Change-Id: Ifab95dbc604ac9d1d8f08e2a5db0a03bda167a55
This commit is contained in:
Ilya Shakhat
parent
e79c4a83f4
commit
4a3649523e
@ -86,7 +86,7 @@ div.drops label {
|
||||
.drop {
|
||||
height: 30px;
|
||||
float: left;
|
||||
margin-right: 25px;
|
||||
margin-right: 20px;
|
||||
}
|
||||
|
||||
.drop label {
|
||||
@ -211,140 +211,3 @@ a[href^="https://launchpad"]:after {
|
||||
.review_mark {
|
||||
font-weight: bold;
|
||||
}
|
||||
|
||||
/* MIRANTIS CSS*/
|
||||
|
||||
#miraheader {
|
||||
margin: 0 auto;
|
||||
width: 960px;
|
||||
}
|
||||
|
||||
#top-menu {
|
||||
height: 30px;
|
||||
}
|
||||
|
||||
#ttopmenu {
|
||||
float: right;
|
||||
height: 20px;
|
||||
overflow: hidden;
|
||||
margin-top: 10px;
|
||||
}
|
||||
|
||||
#ttopmenu a {
|
||||
font-size: 13px;
|
||||
font-style: italic;
|
||||
color: #A7B6C3;
|
||||
}
|
||||
|
||||
#ttopmenu a:hover {
|
||||
color: #6e8598;
|
||||
}
|
||||
|
||||
#main-menu {
|
||||
height: 47px;
|
||||
margin-top: 30px;
|
||||
text-align: right;
|
||||
position: relative;
|
||||
}
|
||||
|
||||
a.glink {
|
||||
color: black;
|
||||
font-family: 'PT Sans Narrow', 'Arial Narrow', arial, sans-serif;
|
||||
font-size: 19px;
|
||||
padding: 5px 5px 5px 12px;
|
||||
white-space: nowrap;
|
||||
text-decoration: none;
|
||||
}
|
||||
|
||||
a.glink:hover {
|
||||
color: #d3301a;
|
||||
}
|
||||
|
||||
.subglobalNav {
|
||||
color: black;
|
||||
position: absolute;
|
||||
font-family: 'PT Sans Narrow', 'Arial Narrow', arial, sans-serif;
|
||||
font-size: 14px;
|
||||
white-space: nowrap;
|
||||
text-decoration: none;
|
||||
right: 0px;
|
||||
padding-top: 10px;
|
||||
}
|
||||
|
||||
.subglobalNav a {
|
||||
color: black;
|
||||
text-decoration: none;
|
||||
padding: 2px 7px 2px 7px;
|
||||
margin-left: 12px;
|
||||
}
|
||||
|
||||
.subglobalNav a:hover {
|
||||
color: #fff;
|
||||
background: #CB2E19;
|
||||
-moz-border-radius: 2px;
|
||||
border-radius: 2px;
|
||||
margin-left: 12px;
|
||||
text-shadow: -1px -1px 0px #7F2114;
|
||||
}
|
||||
|
||||
a.act {
|
||||
color: #d3301a !important;
|
||||
}
|
||||
|
||||
a.act:hover {
|
||||
color: #fff !important;
|
||||
background: #CB2E19;
|
||||
}
|
||||
|
||||
a.active {
|
||||
color: #d3301a;
|
||||
}
|
||||
|
||||
#dummy {
|
||||
height: 115px;
|
||||
margin-top: 20px;
|
||||
width: 100%;
|
||||
}
|
||||
|
||||
#footer {
|
||||
height: 115px;
|
||||
margin-top: -120px;
|
||||
background: url(../images/footer_tile.jpg) repeat-x;
|
||||
font-family: 'PT Sans Narrow', 'Arial Narrow', arial, sans-serif;
|
||||
font-size: 17px;
|
||||
line-height: 21px;
|
||||
text-shadow: 1px 1px 0px white;
|
||||
|
||||
}
|
||||
|
||||
#foottable td {
|
||||
padding-top: 20px;
|
||||
}
|
||||
|
||||
#footer_content {
|
||||
width: 960px;
|
||||
margin: 4px auto auto auto;
|
||||
height: 110px;
|
||||
}
|
||||
|
||||
.fgeneral {
|
||||
color: black;
|
||||
}
|
||||
|
||||
.fgeneralblue {
|
||||
color: #43678a;
|
||||
}
|
||||
|
||||
.fslogan {
|
||||
font-family: 'PT Sans', arial, sans-serif;
|
||||
font-style: italic;
|
||||
color: #43678a;
|
||||
font-size: 13px;
|
||||
}
|
||||
|
||||
#fbox {
|
||||
padding-left: 10px;
|
||||
border-left: 1px solid #d5dbe1;
|
||||
}
|
||||
|
||||
/* MIRANTIS CSS*/
|
||||
@ -388,7 +388,7 @@
|
||||
|
||||
<div class="drop">
|
||||
<label for="release">Release</label>
|
||||
<select id="release" name="release" style="min-width: 130px;" data-placeholder="Select release">
|
||||
<select id="release" name="release" style="min-width: 140px;" data-placeholder="Select release">
|
||||
<option></option>
|
||||
<option value="all">All times</option>
|
||||
{% for release in release_options %}
|
||||
@ -399,7 +399,7 @@
|
||||
|
||||
<div class="drop">
|
||||
<label for="project_type">Projects</label>
|
||||
<select id="project_type" name="project_type" style="min-width: 130px;">
|
||||
<select id="project_type" name="project_type" style="min-width: 140px;">
|
||||
<option value="All">all</option>
|
||||
{% for option_type, option_groups in project_type_options.iteritems() %}
|
||||
<optgroup label="{{ option_type }}">
|
||||
@ -416,22 +416,22 @@
|
||||
|
||||
<div class="drop">
|
||||
<label for="module">Module</label>
|
||||
<input type="hidden" id="module" style="width: 130px" data-placeholder="Any module" value="{{ module }}"/>
|
||||
<input type="hidden" id="module" style="width: 140px" data-placeholder="Any module" value="{{ module }}"/>
|
||||
</div>
|
||||
|
||||
<div class="drop">
|
||||
<label for="company">Company</label>
|
||||
<input type="hidden" id="company" style="width: 130px" data-placeholder="Any company" value="{{ company }}"/>
|
||||
<input type="hidden" id="company" style="width: 140px" data-placeholder="Any company" value="{{ company }}"/>
|
||||
</div>
|
||||
|
||||
<div class="drop">
|
||||
<label for="company">Engineer</label>
|
||||
<input type="hidden" id="user" style="width: 130px" data-placeholder="Any engineer" value="{{ user_id }}"/>
|
||||
<input type="hidden" id="user" style="width: 140px" data-placeholder="Any engineer" value="{{ user_id }}"/>
|
||||
</div>
|
||||
|
||||
<div class="drop">
|
||||
<label for="metric">Metric</label>
|
||||
<select id="metric" name="metric" style="width: 130px">
|
||||
<select id="metric" name="metric" style="width: 140px">
|
||||
{% for metric in metric_options %}
|
||||
<option value="{{ metric[0] }}">{{ metric[1] }}</option>
|
||||
{% endfor %}
|
||||
@ -448,12 +448,12 @@
|
||||
<table style="width: 100%" cellspacing="0">
|
||||
<tr>
|
||||
<td style="width: 50%; vertical-align: top;">
|
||||
<div class="body" style="margin-right: 2em;">
|
||||
<div class="body" style="margin-right: 1em;">
|
||||
{% block left_frame %}{% endblock %}
|
||||
</div>
|
||||
</td>
|
||||
<td style="width: 50%; vertical-align: top;">
|
||||
<div class="body" style="margin-left: 2em;">
|
||||
<div class="body" style="margin-left: 1em;">
|
||||
{% block right_frame %}{% endblock %}
|
||||
</div>
|
||||
</td>
|
||||
|
||||
@ -6,6 +6,8 @@
|
||||
{% set show_user_activity = (user_id) %}
|
||||
{% set show_module_activity = (module) %}
|
||||
{% set show_activity = (show_user_activity) or (show_module_activity) %}
|
||||
{% set show_user_contribution = show_user_activity %}
|
||||
{% set show_module_contribution = show_module_activity %}
|
||||
{% set show_contribution = show_activity %}
|
||||
{% set show_user_profile = (user_id) %}
|
||||
|
||||
@ -102,7 +104,7 @@
|
||||
<div style='font-weight: bold;'>${subject}</div>
|
||||
<div style='white-space: pre-wrap; '>{%html message %}</div>
|
||||
<div><span style="color: green">+<span>${lines_added}</span></span>
|
||||
<span style="color:">- <span>${lines_deleted}</span></span></div>
|
||||
<span style="color: blue">- <span>${lines_deleted}</span></span></div>
|
||||
</div>
|
||||
</div>
|
||||
{% endraw %}
|
||||
@ -238,6 +240,10 @@
|
||||
</div>
|
||||
{% endif %}
|
||||
|
||||
{% if show_module_contribution %}
|
||||
<div id="contribution_container"></div>
|
||||
{% endif %}
|
||||
|
||||
{% endblock %}
|
||||
|
||||
{% block right_frame %}
|
||||
@ -263,16 +269,19 @@
|
||||
</div>
|
||||
{% endif %}
|
||||
|
||||
{% if show_user_activity %}
|
||||
{% if show_user_contribution %}
|
||||
<div id="contribution_container"></div>
|
||||
{% endif %}
|
||||
|
||||
{% if show_module_activity %}
|
||||
<h3 id="activity_header">Activity log</h3>
|
||||
<div id="activity_container"></div>
|
||||
{% endif %}
|
||||
|
||||
{% if show_module_activity %}
|
||||
<div id="contribution_container"></div>
|
||||
<div style="height: 44px;">
|
||||
<div class="dataTables_paginate paging_full_numbers" id="activity_paginate">
|
||||
<a class="last paginate_button" tabindex="0" id="activity_more">More...</a>
|
||||
</div>
|
||||
</div>
|
||||
{% endif %}
|
||||
|
||||
{% endblock %}
|
||||
|
||||
@ -817,6 +817,20 @@ def make_link(title, uri=None, options=None):
|
||||
return '<a href="%(uri)s">%(title)s</a>' % {'uri': uri, 'title': title}
|
||||
|
||||
|
||||
def unwrap_text(text):
|
||||
res = ''
|
||||
for line in text.splitlines():
|
||||
s = line.rstrip()
|
||||
if not s:
|
||||
continue
|
||||
res += line
|
||||
if (not s[0].isalpha()) or (s[-1] in ['.', '!', '?', '>', ':', ';']):
|
||||
res += '\n'
|
||||
else:
|
||||
res += ' '
|
||||
return res.rstrip()
|
||||
|
||||
|
||||
@app.template_filter('commit_message')
|
||||
def make_commit_message(record):
|
||||
s = record['message']
|
||||
@ -833,6 +847,8 @@ def make_commit_message(record):
|
||||
r'\1<a href="https://bugs.launchpad.net/bugs/\2">\2</a>', s)
|
||||
s = re.sub(r'\s+(I[0-9a-f]{40})',
|
||||
r' <a href="https://review.openstack.org/#q,\1,n,z">\1</a>', s)
|
||||
|
||||
s = unwrap_text(s)
|
||||
return s
|
||||
|
||||
|
||||
|
||||
@ -39,9 +39,9 @@ Change-Id: Ie49ccd2138905e178843b375a9b16c3fe572d1db'''
|
||||
'module': module,
|
||||
}
|
||||
|
||||
expected = '''
|
||||
During finish_migration the manager calls initialize_connection but doesn't
|
||||
update the block_device_mapping with the potentially new connection_info
|
||||
expected = '''\
|
||||
During finish_migration the manager calls initialize_connection but doesn't \
|
||||
update the block_device_mapping with the potentially new connection_info \
|
||||
returned.
|
||||
Fixes bug <a href="https://bugs.launchpad.net/bugs/1076801">1076801</a>
|
||||
''' + ('Change-Id: <a href="https://review.openstack.org/#q,'
|
||||
@ -66,7 +66,7 @@ Change-Id: Ie49ccd2138905e178843b375a9b16c3fe572d1db'''
|
||||
'module': module,
|
||||
}
|
||||
|
||||
expected = '''
|
||||
expected = '''\
|
||||
Implemented new driver for Cinder <:
|
||||
Implements Blueprint ''' + (
|
||||
'<a href="https://blueprints.launchpad.net/cinder/+spec/'
|
||||
@ -79,3 +79,9 @@ Implements Blueprint ''' + (
|
||||
|
||||
self.assertEqual(expected, observed,
|
||||
'Commit message should be processed correctly')
|
||||
|
||||
def test_unwrap(self):
|
||||
original = 'Lorem ipsum. Dolor\nsit amet.\n Lorem\n ipsum.\ndolor!\n'
|
||||
expected = 'Lorem ipsum. Dolor sit amet.\n Lorem\n ipsum.\ndolor!'
|
||||
|
||||
self.assertEqual(expected, web.unwrap_text(original))
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user