You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@bloodhound.apache.org by ma...@apache.org on 2013/05/28 15:58:18 UTC
svn commit: r1486925 - in /bloodhound/trunk/bloodhound_theme/bhtheme:
htdocs/bloodhound.css templates/bh_ticket.html
templates/bh_ticket_change.html
Author: matevz
Date: Tue May 28 13:58:18 2013
New Revision: 1486925
URL: http://svn.apache.org/r1486925
Log:
Ref. #533 - quick comment (activity feed) changes
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=1486925&r1=1486924&r2=1486925&view=diff
==============================================================================
--- bloodhound/trunk/bloodhound_theme/bhtheme/htdocs/bloodhound.css (original)
+++ bloodhound/trunk/bloodhound_theme/bhtheme/htdocs/bloodhound.css Tue May 28 13:58:18 2013
@@ -181,17 +181,13 @@ div.reports form {
.activityfeed {
background-image: url("img/change_history_arrow_line.png");
background-repeat: repeat-y;
- background-position: 20px 0px;
+ background-position: 10px 0px;
}
.timeline .activityfeed {
background-image: none;
}
-.activityfeed .help-block {
- margin-left: 30px;
-}
-
#mobile-activity {
margin-top: 50px;
}
@@ -1172,9 +1168,10 @@ table.wiki th {
}
-#changelog div.comment-box {
+#changelog div.comment-box,
+#trac-add-comment div.comment-box {
background-color: rgb(253, 252, 250);
- margin-left: 30px;
+ margin-left: 20px;
margin-bottom: 10px;
display: block;
visibility: visible;
@@ -1183,6 +1180,14 @@ table.wiki th {
max-width: inherit;
}
+#trac-add-comment div.comment-box {
+ margin-bottom: 30px;
+}
+
+#trac-add-comment div.comment-box .popover-title {
+ background-color: rgb(244,250,253);
+}
+
#changelog hr {
margin: 10px auto 5px 0;
width: 75%;
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=1486925&r1=1486924&r2=1486925&view=diff
==============================================================================
--- bloodhound/trunk/bloodhound_theme/bhtheme/templates/bh_ticket.html (original)
+++ bloodhound/trunk/bloodhound_theme/bhtheme/templates/bh_ticket.html Tue May 28 13:58:18 2013
@@ -461,7 +461,7 @@
<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" style="display: inline" class="pull-right">
+ <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>
@@ -470,18 +470,6 @@
<label for="trac-comments-oldest">
<span>Oldest first</span>
</label>
- <span id="trac-threaded-toggle" style="display: none">
- <input type="radio" id="trac-comments-threaded" name="trac-comments-order" value="threaded" />
- <label for="trac-comments-threaded">
- <span>Threaded</span>
- </label>
- </span>
- </div>
- <div style="display: none">
- <input id="trac-comments-only-toggle" type="checkbox" />
- <label for="trac-comments-only-toggle">
- <span class="label">Comments only</span>
- </label>
</div>
</form>
@@ -504,17 +492,24 @@
and any <em class="trac-conflict">conflicts</em> shown in the preview below.
You can nevertheless proceed and submit your changes if you wish so.
</div>
+
<!--! Comment field -->
<fieldset class="iefix">
- <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')}" />
- <label for="comment" class="help-block" i18n:msg="">
- <span class="label label-info">Tip</span>
- You may use
- <a tabindex="42" href="${href.wiki('WikiFormatting')}">WikiFormatting</a>
- here.
- </label>
+ <div class="comment-box popover fade in right">
+ <div class="arrow"></div>
+ <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')}" />
+ <label for="comment" class="help-block" i18n:msg="">
+ <span class="label label-info">Tip</span>
+ You may use
+ <a tabindex="42" href="${href.wiki('WikiFormatting')}">WikiFormatting</a>
+ here.
+ </label>
+ </div>
+ </div>
</fieldset>
</div>
</div>
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=1486925&r1=1486924&r2=1486925&view=diff
==============================================================================
--- bloodhound/trunk/bloodhound_theme/bhtheme/templates/bh_ticket_change.html (original)
+++ bloodhound/trunk/bloodhound_theme/bhtheme/templates/bh_ticket_change.html Tue May 28 13:58:18 2013
@@ -60,7 +60,7 @@ Arguments:
<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 small" py:if="'date' in change"><small>${pretty_dateinfo(change.date)}</small></span>
+ <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 ''}">