You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@allura.apache.org by tv...@apache.org on 2014/01/01 06:36:15 UTC
[1/4] git commit: [#4812] Style tweaks
Updated Branches:
refs/heads/master 65ca68f15 -> 7bea0768f
[#4812] Style tweaks
Signed-off-by: Tim Van Steenburgh <tv...@gmail.com>
Project: http://git-wip-us.apache.org/repos/asf/incubator-allura/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-allura/commit/7bea0768
Tree: http://git-wip-us.apache.org/repos/asf/incubator-allura/tree/7bea0768
Diff: http://git-wip-us.apache.org/repos/asf/incubator-allura/diff/7bea0768
Branch: refs/heads/master
Commit: 7bea0768fa3fc5fd33c26b0b08d5178d2b8eec32
Parents: f21c43e
Author: Tim Van Steenburgh <tv...@gmail.com>
Authored: Wed Jan 1 05:35:14 2014 +0000
Committer: Tim Van Steenburgh <tv...@gmail.com>
Committed: Wed Jan 1 05:35:37 2014 +0000
----------------------------------------------------------------------
ForgeTracker/forgetracker/templates/tracker/new_ticket.html | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/7bea0768/ForgeTracker/forgetracker/templates/tracker/new_ticket.html
----------------------------------------------------------------------
diff --git a/ForgeTracker/forgetracker/templates/tracker/new_ticket.html b/ForgeTracker/forgetracker/templates/tracker/new_ticket.html
index 4af4b6f..dd9f5e9 100644
--- a/ForgeTracker/forgetracker/templates/tracker/new_ticket.html
+++ b/ForgeTracker/forgetracker/templates/tracker/new_ticket.html
@@ -38,12 +38,13 @@
}
.new-ticket-title {
- top: 5px;
+ top: 7px;
position: absolute;
z-index: 21;
}
.new-ticket-title label {
- color: #ffffff;
+ color: #ffffff !important;
+ padding-right: 10px;
}
</style>
{% endblock %}
[3/4] git commit: [#4812] ticket:506 Fix layout in different browsers
Posted by tv...@apache.org.
[#4812] ticket:506 Fix layout in different browsers
Project: http://git-wip-us.apache.org/repos/asf/incubator-allura/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-allura/commit/f21c43e1
Tree: http://git-wip-us.apache.org/repos/asf/incubator-allura/tree/f21c43e1
Diff: http://git-wip-us.apache.org/repos/asf/incubator-allura/diff/f21c43e1
Branch: refs/heads/master
Commit: f21c43e1276141422b596950be5ee15b736da153
Parents: 3a9db46
Author: Igor Bondarenko <je...@gmail.com>
Authored: Wed Dec 25 14:32:31 2013 +0200
Committer: Tim Van Steenburgh <tv...@gmail.com>
Committed: Wed Jan 1 05:35:37 2014 +0000
----------------------------------------------------------------------
.../forgetracker/templates/tracker/new_ticket.html | 14 +++++---------
.../forgetracker/templates/tracker/ticket.html | 1 +
.../templates/tracker_widgets/ticket_form.html | 4 +++-
3 files changed, 9 insertions(+), 10 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/f21c43e1/ForgeTracker/forgetracker/templates/tracker/new_ticket.html
----------------------------------------------------------------------
diff --git a/ForgeTracker/forgetracker/templates/tracker/new_ticket.html b/ForgeTracker/forgetracker/templates/tracker/new_ticket.html
index c984ecd..4af4b6f 100644
--- a/ForgeTracker/forgetracker/templates/tracker/new_ticket.html
+++ b/ForgeTracker/forgetracker/templates/tracker/new_ticket.html
@@ -25,7 +25,7 @@
{% block edit_box %}
<div class="editbox">
<div class="form_holder">
- {{c.ticket_form.display(action=action, value=dict(description=description,
+ {{c.ticket_form.display(action=action, value=dict(description=description,
summary=summary, labels=labels), help_msg=help_msg)}}
</div>
</div>
@@ -33,21 +33,17 @@
{% block extra_css %}
<style type="text/css">
- input[name='ticket_form.summary']{
- top: 5px;
- left: 100px;
- position: absolute;
- z-index: 21;
- }
.markdown_edit textarea {
height: 100px;
}
.new-ticket-title {
- top: 9px;
+ top: 5px;
position: absolute;
z-index: 21;
- color: #FFFFFF !important;
+ }
+ .new-ticket-title label {
+ color: #ffffff;
}
</style>
{% endblock %}
http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/f21c43e1/ForgeTracker/forgetracker/templates/tracker/ticket.html
----------------------------------------------------------------------
diff --git a/ForgeTracker/forgetracker/templates/tracker/ticket.html b/ForgeTracker/forgetracker/templates/tracker/ticket.html
index 508c2c6..4592f72 100644
--- a/ForgeTracker/forgetracker/templates/tracker/ticket.html
+++ b/ForgeTracker/forgetracker/templates/tracker/ticket.html
@@ -245,6 +245,7 @@
<style type="text/css">
input[name='ticket_form.summary']{
top: 5px;
+ left: 10px;
position: absolute;
z-index: 21;
}
http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/f21c43e1/ForgeTracker/forgetracker/templates/tracker_widgets/ticket_form.html
----------------------------------------------------------------------
diff --git a/ForgeTracker/forgetracker/templates/tracker_widgets/ticket_form.html b/ForgeTracker/forgetracker/templates/tracker_widgets/ticket_form.html
index e73bc18..63a448d 100644
--- a/ForgeTracker/forgetracker/templates/tracker_widgets/ticket_form.html
+++ b/ForgeTracker/forgetracker/templates/tracker_widgets/ticket_form.html
@@ -23,7 +23,9 @@
<div id="new-ticket-help-msg" class="grid-19 info">{{g.markdown.convert(help_msg)}}</div>
{% endif %}
<div class="grid-18">
- <label class="new-ticket-title">Create Ticket:</label>{{widget.display_field_by_name('summary')|safe}}
+ <div class="new-ticket-title">
+ <label>Create Ticket:</label>{{widget.display_field_by_name('summary')|safe}}
+ </div>
</div>
{% if widget.fields['_milestone'] %}
<div class="grid-6">
[4/4] git commit: [#4812] ticket:506 Added title to ticket name field
and changed initial focusing to search field
Posted by tv...@apache.org.
[#4812] ticket:506 Added title to ticket name field and changed initial focusing to search field
Project: http://git-wip-us.apache.org/repos/asf/incubator-allura/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-allura/commit/8039b3d8
Tree: http://git-wip-us.apache.org/repos/asf/incubator-allura/tree/8039b3d8
Diff: http://git-wip-us.apache.org/repos/asf/incubator-allura/diff/8039b3d8
Branch: refs/heads/master
Commit: 8039b3d88d06188fa6b5f0a654e98de6c284141b
Parents: 65ca68f
Author: Yaroslav Sokolovsky <ya...@gmail.com>
Authored: Tue Dec 24 13:57:59 2013 +0200
Committer: Tim Van Steenburgh <tv...@gmail.com>
Committed: Wed Jan 1 05:35:37 2014 +0000
----------------------------------------------------------------------
.../forgetracker/templates/tracker/new_ticket.html | 10 +++++++++-
.../templates/tracker_widgets/ticket_form.html | 2 +-
2 files changed, 10 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/8039b3d8/ForgeTracker/forgetracker/templates/tracker/new_ticket.html
----------------------------------------------------------------------
diff --git a/ForgeTracker/forgetracker/templates/tracker/new_ticket.html b/ForgeTracker/forgetracker/templates/tracker/new_ticket.html
index fd75006..649bb6e 100644
--- a/ForgeTracker/forgetracker/templates/tracker/new_ticket.html
+++ b/ForgeTracker/forgetracker/templates/tracker/new_ticket.html
@@ -35,19 +35,27 @@
<style type="text/css">
input[name='ticket_form.summary']{
top: 5px;
+ left: 100px;
position: absolute;
z-index: 21;
}
.markdown_edit textarea {
height: 100px;
}
+
+ .new-ticket-title {
+ top: 9px;
+ position: absolute;
+ z-index: 21;
+ color: #FFFFFF !important;
+ }
</style>
{% endblock %}
{% block extra_js %}
<script type="text/javascript">
$(document).ready(function(){
- $('input[name="ticket_form.summary"]').focus();
+ $('input[name="q"]').focus();
});
</script>
{% endblock %}
http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/8039b3d8/ForgeTracker/forgetracker/templates/tracker_widgets/ticket_form.html
----------------------------------------------------------------------
diff --git a/ForgeTracker/forgetracker/templates/tracker_widgets/ticket_form.html b/ForgeTracker/forgetracker/templates/tracker_widgets/ticket_form.html
index 93f5fcc..e73bc18 100644
--- a/ForgeTracker/forgetracker/templates/tracker_widgets/ticket_form.html
+++ b/ForgeTracker/forgetracker/templates/tracker_widgets/ticket_form.html
@@ -23,7 +23,7 @@
<div id="new-ticket-help-msg" class="grid-19 info">{{g.markdown.convert(help_msg)}}</div>
{% endif %}
<div class="grid-18">
- {{widget.display_field_by_name('summary')|safe}}
+ <label class="new-ticket-title">Create Ticket:</label>{{widget.display_field_by_name('summary')|safe}}
</div>
{% if widget.fields['_milestone'] %}
<div class="grid-6">
[2/4] git commit: [#4812] ticket:506 Removed form submit on enter for
title field
Posted by tv...@apache.org.
[#4812] ticket:506 Removed form submit on enter for title field
Project: http://git-wip-us.apache.org/repos/asf/incubator-allura/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-allura/commit/3a9db46f
Tree: http://git-wip-us.apache.org/repos/asf/incubator-allura/tree/3a9db46f
Diff: http://git-wip-us.apache.org/repos/asf/incubator-allura/diff/3a9db46f
Branch: refs/heads/master
Commit: 3a9db46fdc59ad97bb1b43349498a2705b9bd756
Parents: 8039b3d
Author: Yaroslav Sokolovsky <ya...@gmail.com>
Authored: Tue Dec 24 14:55:36 2013 +0200
Committer: Tim Van Steenburgh <tv...@gmail.com>
Committed: Wed Jan 1 05:35:37 2014 +0000
----------------------------------------------------------------------
ForgeTracker/forgetracker/templates/tracker/new_ticket.html | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/3a9db46f/ForgeTracker/forgetracker/templates/tracker/new_ticket.html
----------------------------------------------------------------------
diff --git a/ForgeTracker/forgetracker/templates/tracker/new_ticket.html b/ForgeTracker/forgetracker/templates/tracker/new_ticket.html
index 649bb6e..c984ecd 100644
--- a/ForgeTracker/forgetracker/templates/tracker/new_ticket.html
+++ b/ForgeTracker/forgetracker/templates/tracker/new_ticket.html
@@ -55,7 +55,8 @@
{% block extra_js %}
<script type="text/javascript">
$(document).ready(function(){
- $('input[name="q"]').focus();
+ $('input[name="ticket_form.summary"]').focus();
});
+ $('input[name="ticket_form.summary"]').keypress(function(event) { return event.keyCode != 13; });
</script>
{% endblock %}