[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-commits
Subject: [websites/bugs-kde-org/kde] /: Make sure the labels do not break inside. Un-primary the search butto
From: Eugene Trounev <eugene.trounev () gmail ! com>
Date: 2012-04-07 19:39:31
Message-ID: 20120407193931.EDC48A60BB () git ! kde ! org
[Download RAW message or body]
Git commit 59106abd0b7bef9435bf0d2e59b6bf1e39b3aaec by Eugene Trounev.
Committed on 07/04/2012 at 21:39.
Pushed by trounev into branch 'kde'.
Make sure the labels do not break inside. Un-primary the search button. Add closing \
option to alerts and JS that facilitates it. Small mod to the new bug form.
M +0 -1 skins/standard/global.css
M +11 -13 template/en/custom/bug/create/create.html.tmpl
M +1 -2 template/en/custom/bug/field-label.html.tmpl
A +244 -0 template/en/custom/bug/field.html.tmpl
M +1 -1 template/en/custom/global/common-links.html.tmpl
M +2 -1 template/en/custom/global/footer.html.tmpl
M +3 -1 template/en/custom/global/header.html.tmpl
http://commits.kde.org/websites/bugs-kde-org/59106abd0b7bef9435bf0d2e59b6bf1e39b3aaec
diff --git a/skins/standard/global.css b/skins/standard/global.css
index 50bd57d..4914b9c 100644
--- a/skins/standard/global.css
+++ b/skins/standard/global.css
@@ -477,7 +477,6 @@ div.user_match {
text-align: right;
vertical-align: top;
font-weight: bold;
- white-space: nowrap;
}
.field_help_link {
cursor: help;
diff --git a/template/en/custom/bug/create/create.html.tmpl \
b/template/en/custom/bug/create/create.html.tmpl index 078e4bb..37e7ec6 100644
--- a/template/en/custom/bug/create/create.html.tmpl
+++ b/template/en/custom/bug/create/create.html.tmpl
@@ -174,7 +174,8 @@ TUI_hide_default('attachment_text_field');
<input type="hidden" name="product" value="[% product.name FILTER html %]">
<input type="hidden" name="token" value="[% token FILTER html %]">
-<div class="alert alert-info">
+<div class="alert">
+ <a class="close" data-dismiss="alert" href="#">×</a>
[%# Migration note: The following file corresponds to the old Param
# 'entryheaderhtml'
#%]
@@ -195,7 +196,7 @@ TUI_hide_default('attachment_text_field');
'bz_default_hidden');
</script>
-<table class="table table-bordered">
+<table class="table">
<tbody>
<tr>
[% INCLUDE bug/field.html.tmpl
@@ -679,21 +680,18 @@ TUI_hide_default('attachment_text_field');
<tbody>
[%# Form controls for entering additional data about the bug being created. %]
[% Hook.process("form") %]
-
- <tr>
- <th> </th>
- <td colspan="3">
- <input type="submit" id="commit" value="Submit [% terms.Bug %]" class="btn \
btn-primary btn-large"> +</tbody>
+ </table>
+ <input type="hidden" name="form_name" value="enter_bug">
+
+ <div class="form-actions">
+ <input type="submit" id="commit" value="Submit [% terms.Bug %]" class="btn \
btn-primary">
<input type="submit" name="maketemplate" id="maketemplate"
value="Remember values as bookmarkable template"
onclick="bz_no_validate_enter_bug=true" class="expert_fields">
- </td>
- </tr>
-</tbody>
- </table>
- <input type="hidden" name="form_name" value="enter_bug">
- <fieldset>
+ </div>
+ </fieldset>
</form>
[%# Links or content with more information about the bug being created. %]
diff --git a/template/en/custom/bug/field-label.html.tmpl \
b/template/en/custom/bug/field-label.html.tmpl index 3b2f1ab..765892c 100644
--- a/template/en/custom/bug/field-label.html.tmpl
+++ b/template/en/custom/bug/field-label.html.tmpl
@@ -36,8 +36,7 @@
[% IF editable %]
<label for="[% field.name FILTER html %]"[% IF accesskey %] accesskey="[% \
accesskey FILTER html %]"[% END %]> [% END %]
- [%- field_descs.${field.name} FILTER html %]
- <a
+ [%- field_descs.${field.name} FILTER html %] <a
[% IF help_html.${field.name}.defined %]
title="[% help_html.${field.name} FILTER txt FILTER collapse FILTER html %]"
class="field_help_link"
diff --git a/template/en/custom/bug/field.html.tmpl \
b/template/en/custom/bug/field.html.tmpl new file mode 100644
index 0000000..9c956ea
--- /dev/null
+++ b/template/en/custom/bug/field.html.tmpl
@@ -0,0 +1,244 @@
+[%# The contents of this file are subject to the Mozilla Public
+ # License Version 1.1 (the "License"); you may not use this file
+ # except in compliance with the License. You may obtain a copy of
+ # the License at http://www.mozilla.org/MPL/
+ #
+ # 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 the Bugzilla Bug Tracking System.
+ #
+ # The Initial Developer of the Original Code is Netscape Communications
+ # Corporation. Portions created by Netscape are
+ # Copyright (C) 1998 Netscape Communications Corporation. All
+ # Rights Reserved.
+ #
+ # Contributor(s): Myk Melez <myk@mozilla.org>
+ # Max Kanat-Alexander <mkanat@bugzilla.org>
+ # Elliotte Martin <elliotte_martin@yahoo.com>
+ # Guy Pyrzak <guy.pyrzak@gmail.com>
+ # Reed Loden <reed@reedloden.com>
+ #%]
+
+[%# INTERFACE:
+ # field: a Bugzilla::Field object
+ # value: The value of the field for this bug.
+ # override_legal_values (optional): The list of legal values, for select fields.
+ # editable: Whether the field should be displayed as an editable
+ # <input> or as just the plain text of its value.
+ # allow_dont_change: display the --do_not_change-- option for select fields.
+ # value_span: A colspan for the table cell containing
+ # the field value.
+ # no_tds: boolean; if true, don't display the label <th> or the
+ # wrapping <td> for the field.
+ # bug (optional): The current Bugzilla::Bug being displayed, or a hash
+ # with default field values being displayed on a page.
+ #%]
+
+[% SET hidden = 0 %]
+[% IF bug AND !field.is_visible_on_bug(bug) %]
+ [% SET hidden = 1 %]
+[% END %]
+
+[% IF NOT no_tds %]
+ [% PROCESS "bug/field-label.html.tmpl" %]
+ <td class="field_value [% ' bz_hidden_field' IF hidden %]"
+ id="field_container_[% field.name FILTER html %]"
+ [% " colspan=\"$value_span\"" FILTER none IF value_span %]>
+[% END %]
+[% Hook.process('start_field_column') %]
+[% IF editable %]
+ [% SWITCH field.type %]
+ [% CASE constants.FIELD_TYPE_FREETEXT %]
+ <input id="[% field.name FILTER html %]" class="text_input"
+ name="[% field.name FILTER html %]"
+ value="[% value FILTER html %]" size="40"
+ maxlength="[% constants.MAX_FREETEXT_LENGTH FILTER none %]"
+ [% ' aria-required="true"' IF field.is_mandatory %]>
+ [% CASE constants.FIELD_TYPE_DATETIME %]
+ <input name="[% field.name FILTER html %]" size="20"
+ id="[% field.name FILTER html %]"
+ value="[% value FILTER html %]"
+ [% ' aria-required="true"' IF field.is_mandatory %]
+ onchange="updateCalendarFromField(this)">
+ <button type="button" class="calendar_button"
+ id="button_calendar_[% field.name FILTER html %]"
+ onclick="showCalendar('[% field.name FILTER js %]')">
+ <span>Calendar</span>
+ </button>
+
+ <div id="con_calendar_[% field.name FILTER html %]"></div>
+
+ <script type="text/javascript">
+ createCalendar('[% field.name FILTER js %]')
+ </script>
+ [% CASE constants.FIELD_TYPE_BUG_ID %]
+ <span id="[% field.name FILTER html %]_input_area">
+ <input name="[% field.name FILTER html %]" id="[% field.name FILTER html \
%]" + value="[% value FILTER html %]" size="7"
+ [% ' aria-required="true"' IF field.is_mandatory %]>
+
+ </span>
+
+ [% IF value %]
+ [% value FILTER bug_link(value, use_alias => 1) FILTER none %]
+ [% END %]
+ <span id="[% field.name FILTER html %]_edit_container" class="edit_me \
bz_default_hidden"> + (<a href="#" id="[% field.name FILTER html \
%]_edit_action">edit</a>) + </span>
+ <script type="text/javascript">
+ hideEditableField('[% field.name FILTER js %]_edit_container',
+ '[% field.name FILTER js %]_input_area',
+ '[% field.name FILTER js %]_edit_action',
+ '[% field.name FILTER js %]',
+ "[% value FILTER js %]");
+ </script>
+ [% CASE [ constants.FIELD_TYPE_SINGLE_SELECT
+ constants.FIELD_TYPE_MULTI_SELECT ] %]
+ <select id="[% field.name FILTER html %]"
+ name="[% field.name FILTER html %]"
+ [% IF field.type == constants.FIELD_TYPE_MULTI_SELECT %]
+ [% SET field_size = 5 %]
+ [% IF field.legal_values.size < 5 %]
+ [% SET field_size = field.legal_values.size %]
+ [% END %]
+ size="[% field_size FILTER html %]" multiple="multiple"
+ [% ' aria-required="true"' IF field.is_mandatory %]
+ [% END %]
+ >
+ [% IF allow_dont_change %]
+ <option value="[% dontchange FILTER html %]"
+ [% ' selected="selected"' IF value == dontchange %]>
+ [% dontchange FILTER html %]
+ </option>
+ [% END %]
+ [% IF override_legal_values %]
+ [% legal_values = override_legal_values %]
+ [% ELSE %]
+ [% legal_values = field.legal_values %]
+ [% END %]
+ [% FOREACH legal_value = legal_values %]
+ [% NEXT IF NOT legal_value.is_active AND NOT \
value.contains(legal_value.name).size %] + <option value="[% \
legal_value.name FILTER html %]" + id="v[% legal_value.id FILTER \
html %]_ + [%- field.name FILTER html %]"
+ [%# We always show selected values, even if they should be
+ # hidden %]
+ [% IF value.contains(legal_value.name).size %]
+ selected="selected"
+ [% ELSIF bug AND !legal_value.is_visible_on_bug(bug) %]
+ class="bz_hidden_option" disabled="disabled"
+ [% END %]>
+ [%- display_value(field.name, legal_value.name) FILTER html ~%]
+ </option>
+ [% END %]
+ </select>
+ [%# When you pass an empty multi-select in the web interface,
+ # it doesn't appear at all in the CGI object. Instead of
+ # forcing all users of process_bug to always specify every
+ # multi-select, we have this field defined if the multi-select
+ # field is defined, and then if this is passed but the multi-select
+ # isn't, we know that the multi-select was emptied.
+ %]
+ [% IF field.type == constants.FIELD_TYPE_MULTI_SELECT %]
+ <input type="hidden" name="defined_[% field.name FILTER html %]">
+ [% END %]
+
+ <script type="text/javascript">
+ <!--
+ initHidingOptionsForIE('[% field.name FILTER js %]');
+ [%+ INCLUDE "bug/field-events.js.tmpl" field = field %]
+ //-->
+ </script>
+
+ [% CASE constants.FIELD_TYPE_TEXTAREA %]
+ [% INCLUDE global/textarea.html.tmpl
+ id = field.name name = field.name minrows = 4 maxrows = 8
+ cols = 60 defaultcontent = value mandatory = field.is_mandatory %]
+ [% CASE constants.FIELD_TYPE_BUG_URLS %]
+ [% '<ul class="bug_urls">' IF value.size %]
+ [% FOREACH bug_url = value %]
+ <li>
+ [% PROCESS bug_url_link bug_url = bug_url %]
+ <label><input type="checkbox" value="[% bug_url.name FILTER html %]"
+ name="remove_[% field.name FILTER html %]">
+ Remove</label>
+ </li>
+ [% END %]
+ [% '</ul>' IF value.size %]
+
+ [% IF Param('use_see_also') %]
+ <span id="container_showhide_[% field.name FILTER html %]"
+ class="bz_default_hidden">
+ <a href="#" id="showhide_[% field.name FILTER html %]">(add)</a>
+ </span>
+ <div id="container_[% field.name FILTER html %]">
+ <label for="[% field.name FILTER html %]">
+ <strong>Add [% terms.Bug %] URLs:</strong>
+ </label><br>
+ <input type="text" id="[% field.name FILTER html %]" size="40"
+ class="text_input" name="[% field.name FILTER html %]">
+ </div>
+ <script type="text/javascript">
+ setupEditLink('[% field.name FILTER js %]');
+ </script>
+ [% END %]
+ [% CASE constants.FIELD_TYPE_KEYWORDS %]
+ <div id="keyword_container">
+ <input type="text" id="[% field.name FILTER html %]" size="40"
+ class="text_input" name="[% field.name FILTER html %]"
+ value="[% value FILTER html %]">
+ <div id="keyword_autocomplete"></div>
+ </div>
+ <script type="text/javascript" defer="defer">
+ YAHOO.bugzilla.keyword_array = [
+ [%- FOREACH keyword = all_keywords %]
+ [%-# %]"[% keyword.name FILTER js %]"
+ [%- "," IF NOT loop.last %][% END %]];
+ YAHOO.bugzilla.keywordAutocomplete.init('[% field.name FILTER js %]',
+ 'keyword_autocomplete');
+ </script>
+ [% END %]
+[% ELSIF field.type == constants.FIELD_TYPE_TEXTAREA %]
+ <div class="uneditable_textarea">[% value FILTER html %]</div>
+[% ELSIF field.type == constants.FIELD_TYPE_BUG_ID %]
+ [% IF value %]
+ [% value FILTER bug_link(value, use_alias => 1) FILTER none %]
+ [% END %]
+[% ELSIF field.type == constants.FIELD_TYPE_BUG_URLS %]
+ [% '<ul class="bug_urls">' IF value.size %]
+ [% FOREACH bug_url = value %]
+ <li>
+ [% PROCESS bug_url_link bug_url = bug_url %]
+ </li>
+ [% END %]
+ [% '</ul>' IF value.size %]
+[% ELSE %]
+ [% value.join(', ') FILTER html %]
+[% END %]
+[% Hook.process('end_field_column') %]
+[% '</td>' IF NOT no_tds %]
+
+[%# for reverse relationships, we show this pseudo-field after the main field %]
+[% IF bug.id && field.is_relationship %]
+ [% extra_field_item = {} %]
+ [% extra_field_item.header = field.reverse_desc _ ":" FILTER html %]
+ [% extra_field_item.data = BLOCK %]
+ [% FOREACH depbug = bug.related_bugs(field) %]
+ [% depbug.id FILTER bug_link(depbug, use_alias => 1) FILTER none %][% " \
" %] + [% END %]
+ [% END %]
+[% ELSE %]
+ [% extra_field_item = '' %]
+[% END %]
+
+[% BLOCK bug_url_link %]
+ [% IF bug_url.isa('Bugzilla::BugUrl::Bugzilla::Local') %]
+ [% bug_url.target_bug_id FILTER bug_link(bug_url.target_bug_id, use_alias => 1) \
FILTER none %] + [% ELSE %]
+ <a href="[% bug_url.name FILTER html %]">
+ [% bug_url.name FILTER html %]</a>
+ [% END %]
+[% END %]
diff --git a/template/en/custom/global/common-links.html.tmpl \
b/template/en/custom/global/common-links.html.tmpl index b9aae53..13167dd 100644
--- a/template/en/custom/global/common-links.html.tmpl
+++ b/template/en/custom/global/common-links.html.tmpl
@@ -30,7 +30,7 @@
return false; } return true;">
<input class="txt" type="text" id="quicksearch[% qs_suffix FILTER html %]" \
name="quicksearch" title="Quick Search" value="[% quicksearch FILTER html %]">
- <input class="btn btn-primary" type="submit" value="Search"
+ <input class="btn" type="submit" value="Search"
id="find[% qs_suffix FILTER html %]">
<a href="page.cgi?id=quicksearch.html" title="Quicksearch Help"><i \
class="icon-info-sign icon-blue"></i></a> [%-# Work around FF bug: keep this on one \
line %]</form>
diff --git a/template/en/custom/global/footer.html.tmpl \
b/template/en/custom/global/footer.html.tmpl index d128e6f..d595a5c 100644
--- a/template/en/custom/global/footer.html.tmpl
+++ b/template/en/custom/global/footer.html.tmpl
@@ -30,7 +30,7 @@
[%# Saved searches %]
[% IF user.showmybugslink OR user.queries.size %]
- <div>
+ <div class="well">
<h3>
Saved Searches:
</h3>
@@ -94,6 +94,7 @@
[% Hook.process("end") %]
<!-- Placed at the end of the document so the pages load faster -->
<script src="js/neverland/jquery.js"></script>
+ <script src="assets/js/bootstrap-alert.js"></script>
<script src="js/neverland/bootstrap-dropdown.js"></script>
<script src="js/neverland/bootstrap-collapse.js"></script>
</body>
diff --git a/template/en/custom/global/header.html.tmpl \
b/template/en/custom/global/header.html.tmpl index a62612c..fb80740 100644
--- a/template/en/custom/global/header.html.tmpl
+++ b/template/en/custom/global/header.html.tmpl
@@ -283,7 +283,9 @@
[% END %]
[% IF message %]
-<div class="alert">[% message %]</div>
+<div class="alert">
+<a class="close" data-dismiss="alert" href="#">×</a>
+[% message %]</div>
[% END %]
[% BLOCK format_css_link %]
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic