Author: matevz
Date: Fri Apr 5 12:13:28 2013
New Revision: 1464937
URL: http://svn.apache.org/r1464937
Log:
Ref. #468 - alignment and minor UI fixes to QCT dialog
Modified:
bloodhound/trunk/bloodhound_theme/bhtheme/htdocs/bloodhound.css
bloodhound/trunk/bloodhound_theme/bhtheme/htdocs/js/theme.js
bloodhound/trunk/bloodhound_theme/bhtheme/templates/bloodhound_theme.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=1464937&r1=1464936&r2=1464937&view=diff
==============================================================================
--- bloodhound/trunk/bloodhound_theme/bhtheme/htdocs/bloodhound.css (original)
+++ bloodhound/trunk/bloodhound_theme/bhtheme/htdocs/bloodhound.css Fri Apr 5
12:13:28 2013
@@ -293,45 +293,17 @@ pre {
/* @end */
-/* @group Quick Ticket fieldset */
+/* @group Quick Create Ticket popup */
-#qct-fieldset {
- position: relative;
-}
-
-#qct-fieldset .form-horizontal {
- position: relative;
- left: -65px;
+#qct-box .linkfull {
+ position: relative;
+ bottom: 20px;
}
-#qct-fieldset .controls {
+#qct-box .controls {
margin-bottom: 5px;
}
-#qct-fieldset #field-summary {
- width: 100%;
-}
-
-#qct-fieldset #field-description {
- width: 100%;
-}
-
-#qct-box #qct-cancel {
- display: inline;
- color: #08C;
- margin-top: 5px;
- padding: 5px 15px;
-}
-
-#qct-create {
- margin-left: 100px;
-}
-
-#qct-cancel {
- position: relative;
- top: 5px;
-}
-
#qct-box p {
white-space: normal;
}
@@ -343,6 +315,8 @@ pre {
padding: 3px;
}
+/* @end */
+
/* @group Generic rules */
.full-x {
Modified: bloodhound/trunk/bloodhound_theme/bhtheme/htdocs/js/theme.js
URL:
http://svn.apache.org/viewvc/bloodhound/trunk/bloodhound_theme/bhtheme/htdocs/js/theme.js?rev=1464937&r1=1464936&r2=1464937&view=diff
==============================================================================
--- bloodhound/trunk/bloodhound_theme/bhtheme/htdocs/js/theme.js (original)
+++ bloodhound/trunk/bloodhound_theme/bhtheme/htdocs/js/theme.js Fri Apr 5
12:13:28 2013
@@ -57,7 +57,7 @@ $( function () {
// Clear input controls inside quick create box
function qct_clearui() {
- $('#qct-fieldset input, #qct-fieldset select, #qct-fieldset
textarea').val('');
+ $('#qct-form input, #qct-form select, #qct-form textarea').val('');
}
// We want to submit via #qct-create
Modified:
bloodhound/trunk/bloodhound_theme/bhtheme/templates/bloodhound_theme.html
URL:
http://svn.apache.org/viewvc/bloodhound/trunk/bloodhound_theme/bhtheme/templates/bloodhound_theme.html?rev=1464937&r1=1464936&r2=1464937&view=diff
==============================================================================
--- bloodhound/trunk/bloodhound_theme/bhtheme/templates/bloodhound_theme.html
(original)
+++ bloodhound/trunk/bloodhound_theme/bhtheme/templates/bloodhound_theme.html
Fri Apr 5 12:13:28 2013
@@ -116,7 +116,7 @@
<div class="btn-group">
<py:def function="field_select(field, value)">
<select id="field-${field.name}" name="field_${field.name}"
- class="input-medium" data-empty="true"
data-field="${field.name}">
+ class="input-block-level" data-empty="true"
data-field="${field.name}">
<option py:if="field.optional"></option>
<option py:for="option in field.options"
selected="${value == option or None}"
@@ -132,42 +132,21 @@
</optgroup>
</select>
</py:def>
- <py:def function="qct_box()">
- <div>
- <label for="field-summary">Summary</label>
- <input type="text" id="field-summary"
- name="field_summary" placeholder="Ticket summary" />
- </div>
- <div>
- <label for="field-description">Description</label>
- <textarea id="field-description" name="field_description"
- rows="3" cols="28"
- placeholder="Ticket description"></textarea>
- </div>
- <div class="form-horizontal">
- <py:for each="field in qct.fields">
- <label class="control-label"
for="field-${field.name}">${field.label}</label>
- <div class="controls">
- ${field_select(field, None)}
- </div>
- </py:for>
- </div>
- </py:def>
+
<py:choose test="">
<py:when test="qct">
<a href="#" class="btn btn-primary dropdown-toggle"
id="qct-newticket" data-animation="true"
data-html="true"
data-trigger="manual" data-toggle="dropdown">
<span class="visible-phone"><i class="icon-plus-sign
icon-white"></i></span>
- <span class="hidden-phone">Create Ticket</span>
+ <span class="hidden-phone">Create Ticket <span
class="caret"></span></span>
</a>
<div id="qct-box" class="dropdown-menu" style="width:
300px;"
py:choose="">
<div class="popover-title">
<h3>
Create Ticket
- <a style="top: -33px; right: -25px; position:
relative;"
- class="pull-right" href="${href.newticket()}">
+ <a class="pull-right linkfull"
href="${href.newticket()}">
<small>Full dialogue »</small>
</a>
</h3>
@@ -175,12 +154,31 @@
<div class="popover-content">
<py:when test="'TICKET_CREATE' in perm">
<form id="qct-form" name="qct" method="post">
- <div id="qct-fieldset">
- ${qct_box()}
+ <div class="control-group">
+ <label for="field-summary">Summary</label>
+ <input type="text" id="field-summary"
class="input-block-level"
+ name="field_summary" placeholder="Ticket
summary" />
+ </div>
+
+ <div class="control-group">
+ <label
for="field-description">Description</label>
+ <textarea id="field-description"
class="input-block-level"
+ name="field_description" rows="3" cols="28"
+ placeholder="Ticket
description"></textarea>
+ </div>
+
+ <div class="control-group">
+ <py:for each="field in qct.fields">
+ <label
for="field-${field.name}">${field.label}</label>
+ ${field_select(field, None)}
+ </py:for>
</div>
</form>
- <button id="qct-create" class="btn"
data-target="${href()}">Create</button>
- <a id="qct-cancel">Cancel</a>
+
+ <div class="controls pull-right">
+ <button id="qct-create" class="btn btn-primary"
data-target="${href()}">Create</button>
+ <button id="qct-cancel"
class="btn">Cancel</button>
+ </div>
</py:when>
<div py:otherwise="" class="alert alert-info">
<p>
