Author: matevz
Date: Wed May 29 11:28:49 2013
New Revision: 1487439
URL: http://svn.apache.org/r1487439
Log:
Ref. #533 - further fixes to activity feed
Modified:
bloodhound/trunk/bloodhound_theme/bhtheme/htdocs/bloodhound.css
bloodhound/trunk/bloodhound_theme/bhtheme/templates/bh_ticket.html
bloodhound/trunk/bloodhound_theme/bhtheme/templates/bh_ticket_change.html
Modified: bloodhound/trunk/bloodhound_theme/bhtheme/htdocs/bloodhound.css
URL:
http://svn.apache.org/viewvc/bloodhound/trunk/bloodhound_theme/bhtheme/htdocs/bloodhound.css?rev=1487439&r1=1487438&r2=1487439&view=diff
==============================================================================
--- bloodhound/trunk/bloodhound_theme/bhtheme/htdocs/bloodhound.css (original)
+++ bloodhound/trunk/bloodhound_theme/bhtheme/htdocs/bloodhound.css Wed May 29
11:28:49 2013
@@ -178,16 +178,6 @@ div.reports form {
font-weight: normal;
}
-.activityfeed {
- background-image: url("img/change_history_arrow_line.png");
- background-repeat: repeat-y;
- background-position: 10px 0px;
-}
-
-.timeline .activityfeed {
- background-image: none;
-}
-
#mobile-activity {
margin-top: 50px;
}
@@ -439,12 +429,6 @@ h1, h2, h3, h4 {
font-size: 13px;
}
-.comment p {
- margin: 5px inherit;
- color: rgb(80, 80, 80);
-}
-
-
/* @end */
/* @group Search */
@@ -1172,24 +1156,31 @@ table.wiki th {
#trac-add-comment div.comment-box {
background-color: rgb(253, 252, 250);
margin-left: 20px;
- margin-bottom: 10px;
+ margin-bottom: 5px;
display: block;
visibility: visible;
position: relative;
z-index: 0;
max-width: inherit;
+ box-shadow: none;
}
#trac-add-comment div.comment-box {
- margin-bottom: 30px;
+ background-color: rgb(220,239,248);
}
-#trac-add-comment div.comment-box .popover-title {
- background-color: rgb(244,250,253);
+div.comment-box .popover-title {
+ background-color: inherit;
+ border: none;
+ padding-bottom: 2px;
+}
+
+div.comment-box .comment p {
+ display: inline;
}
#changelog hr {
- margin: 10px auto 5px 0;
+ margin: 5px auto 5px 0;
width: 75%;
}
@@ -1213,8 +1204,15 @@ textarea#comment, #trac-add-comment fiel
margin-left: 0;
margin-bottom: 5px;
padding-right: 14px;
- background-color: #f5fafd;
- color: inherit;
+}
+
+.popover-content i[class^="icon-"],
+.popover-content i[class*=" icon-"] {
+ opacity: 0.6;
+}
+
+.activityfeed #prefs {
+ margin-bottom: 5px;
}
.ticket form#prefs input[type="radio"]{
Modified: bloodhound/trunk/bloodhound_theme/bhtheme/templates/bh_ticket.html
URL:
http://svn.apache.org/viewvc/bloodhound/trunk/bloodhound_theme/bhtheme/templates/bh_ticket.html?rev=1487439&r1=1487438&r2=1487439&view=diff
==============================================================================
--- bloodhound/trunk/bloodhound_theme/bhtheme/templates/bh_ticket.html
(original)
+++ bloodhound/trunk/bloodhound_theme/bhtheme/templates/bh_ticket.html Wed May
29 11:28:49 2013
@@ -318,10 +318,6 @@
</head>
<body>
- <py:def function="commentref(prefix, cnum, cls=None)">
- <a href="#comment:$cnum" class="$cls">$prefix$cnum</a>
- </py:def>
-
<py:def function="render_ticket_summary(t, showid)">
<py:if test="showid"><h2><span class="visible-phone">${'#' + t.id if
t.exists else 'NEW'} - </span></h2></py:if>
<h2 class="ticket-summary searchable clip-affix" contenteditable="false"
@@ -460,19 +456,6 @@
</div>
<div class="${cols_activity + ' activityfeed' if ticket.exists else
None}">
- <form py:if="ticket.exists" id="prefs" method="get"
action="${href.prefs()}">
- <div id="trac-comments-order" class="pull-right">
- <input type="radio" id="trac-comments-newest"
name="trac-comments-order" value="newest" />
- <label for="trac-comments-newest">
- <span>Newest first</span>
- </label>
- <input type="radio" id="trac-comments-oldest"
name="trac-comments-order" value="oldest" checked="checked" />
- <label for="trac-comments-oldest">
- <span>Oldest first</span>
- </label>
- </div>
- </form>
-
<form py:if="has_property_editor" method="post" id="propertyform"
action="${href.ticket(ticket.id) + '#trac-add-comment' if
ticket.exists
else href.newticket() + '#ticket'}">
@@ -495,18 +478,19 @@
<!--! Comment field -->
<fieldset class="iefix">
- <div class="comment-box popover fade in right">
- <div class="arrow"></div>
+ <div class="comment-box popover fade in right"
id="newcomment">
<div class="popover-title"><i class="icon-comment"></i>
Add quick comment</div>
<div class="popover-content">
<textarea id="comment" name="comment"
class="trac-resizable" rows="2"
placeholder="Enter new comment"
onfocus="this.placeholder = ''" onblur="this.placeholder = 'Enter new
comment'">${comment}</textarea>
- <input type="submit" id="comment-submit" class="btn
pull-right" name="submit" value="${_('Submit')}" />
+ <input type="submit" id="comment-submit" class="btn
btn-small pull-right" name="submit" value="${_('Submit')}" />
<label for="comment" class="help-block" i18n:msg="">
<span class="label label-info">Tip</span>
+ <small>
You may use
<a tabindex="42"
href="${href.wiki('WikiFormatting')}">WikiFormatting</a>
here.
+ </small>
</label>
</div>
</div>
@@ -686,6 +670,20 @@
</div>
</form>
+ <form py:if="ticket.exists" id="prefs" method="get"
action="${href.prefs()}">
+ <div id="trac-comments-order" class="pull-right">
+ <input type="radio" id="trac-comments-newest"
name="trac-comments-order" value="newest" />
+ <label for="trac-comments-newest">
+ <span>Newest first</span>
+ </label>
+ <input type="radio" id="trac-comments-oldest"
name="trac-comments-order" value="oldest" checked="checked" />
+ <label for="trac-comments-oldest">
+ <span>Oldest first</span>
+ </label>
+ </div>
+ <div class="clearboth"></div>
+ </form>
+
<div id="changelog">
<!--! add comment + modify ticket -->
<py:for each="change in changes">
Modified:
bloodhound/trunk/bloodhound_theme/bhtheme/templates/bh_ticket_change.html
URL:
http://svn.apache.org/viewvc/bloodhound/trunk/bloodhound_theme/bhtheme/templates/bh_ticket_change.html?rev=1487439&r1=1487438&r2=1487439&view=diff
==============================================================================
--- bloodhound/trunk/bloodhound_theme/bhtheme/templates/bh_ticket_change.html
(original)
+++ bloodhound/trunk/bloodhound_theme/bhtheme/templates/bh_ticket_change.html
Wed May 29 11:28:49 2013
@@ -57,16 +57,15 @@ Arguments:
<div class="comment-box popover fade in${' right' if change.comment else
None}" id="${'comment:' + str(cnum) if cnum else ''}">
- <div py:if="change.comment" class="arrow"></div>
<div class="popover-title">
<i class="icon-user"></i> <i>${authorinfo(change.author)}</i>
<span class="pull-right" py:if="'date' in
change"><small>${pretty_dateinfo(change.date)}</small></span>
</div>
<div class="popover-content">
- <ul py:if="change.fields" class="alert alert-info changes${'
creation-event' if not change.cnum else ''}">
+ <ul py:if="change.fields" class="changes${' creation-event' if not
change.cnum else ''}">
<li py:for="field_name, field in sorted(change.fields.iteritems(),
key=lambda item: item[1].label.lower())"
class="trac-field-${field_name}${'trac-conflict' if preview and
field_name in conflicts else None} visible-desktop-hover">
- <strong class="trac-field-${field_name}">${field.label}</strong>
+ <i class="icon-pencil"></i> <strong
class="trac-field-${field_name}">${field.label}</strong>
<span>
<py:choose>
<py:when test="field_name == 'reported'">
@@ -103,13 +102,14 @@ Arguments:
${wikiout(context, text)}
</div>
<div py:when="show_history" class="comment searchable"
xml:space="preserve">
- ${wikiout(context, change.comment_history[int(cversion)].comment)}
+ <i class="icon-comment"></i> ${wikiout(context,
change.comment_history[int(cversion)].comment)}
+ <hr />
</div>
<div py:when="change.comment" class="comment searchable"
xml:space="preserve">
- ${wikiout(context, change.comment)}
+ <i class="icon-comment"></i> ${wikiout(context, change.comment)}
+ <hr />
</div>
</py:choose>
- <hr />
<div py:if="not show_editor and len(change.comment_history) > 1"
py:choose=""
class="trac-lastedit ${'trac-shade' if comment_version !=
max_version else None} lastmod">
<i18n:msg params="version, date, author" py:when="comment_version !=
max_version">
@@ -163,17 +163,16 @@ Arguments:
</div>
<div class="btn-toolbar buttons">
<div class="btn-group">
- <input class="btn" type="submit" name="preview_comment"
value="${_('Preview')}"
+ <input class="btn btn-small" type="submit"
name="preview_comment" value="${_('Preview')}"
title="${_('Preview changes to comment %(cnum)s',
cnum=cnum)}"/>
- <input class="btn" type="submit" name="edit_comment"
value="${_('Submit changes')}"
+ <input class="btn btn-small" type="submit" name="edit_comment"
value="${_('Submit changes')}"
title="${_('Submit changes to comment %(cnum)s',
cnum=cnum)}"/>
</div>
- <input class="btn-link" type="submit" name="cancel_comment"
value="${_('Cancel')}"
+ <input class="btn-link btn-small" type="submit"
name="cancel_comment" value="${_('Cancel')}"
title="Cancel comment edit"/>
</div>
</form>
</py:if>
-
</div>
</div>
</html>
