You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@allura.apache.org by br...@apache.org on 2014/04/15 21:22:33 UTC

[1/2] git commit: [#7295] ticket:562 Made name & description fields bigger on merge request page

Repository: allura
Updated Branches:
  refs/heads/master f1c8b6d97 -> b9cfb73d5


[#7295] ticket:562 Made name & description fields bigger on merge request page


Project: http://git-wip-us.apache.org/repos/asf/allura/repo
Commit: http://git-wip-us.apache.org/repos/asf/allura/commit/80b24cf6
Tree: http://git-wip-us.apache.org/repos/asf/allura/tree/80b24cf6
Diff: http://git-wip-us.apache.org/repos/asf/allura/diff/80b24cf6

Branch: refs/heads/master
Commit: 80b24cf6064939da0b19cb3cf990b7aeb286d38a
Parents: f1c8b6d
Author: Ferens Dmitriy <fe...@gmail.com>
Authored: Mon Apr 7 15:39:13 2014 +0300
Committer: Dave Brondsema <da...@brondsema.net>
Committed: Tue Apr 15 15:22:26 2014 -0400

----------------------------------------------------------------------
 Allura/allura/lib/widgets/repo.py                         | 8 ++++++--
 Allura/allura/lib/widgets/resources/css/merge_request.css | 7 +++++++
 2 files changed, 13 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/allura/blob/80b24cf6/Allura/allura/lib/widgets/repo.py
----------------------------------------------------------------------
diff --git a/Allura/allura/lib/widgets/repo.py b/Allura/allura/lib/widgets/repo.py
index 4017952..04ce74f 100644
--- a/Allura/allura/lib/widgets/repo.py
+++ b/Allura/allura/lib/widgets/repo.py
@@ -67,7 +67,7 @@ class SCMMergeRequestWidget(ff.ForgeForm):
     @property
     def fields(self):
         result = [
-            ew.TextField(name='summary'),
+            ew.TextField(name='summary', css_class='summary'),
             ew.SingleSelectField(
                 name='source_branch',
                 label='Source Branch',
@@ -76,9 +76,13 @@ class SCMMergeRequestWidget(ff.ForgeForm):
                 name='target_branch',
                 label='Target Branch',
                 options=self.target_branches),
-            ffw.AutoResizeTextarea(name='description')]
+            ffw.AutoResizeTextarea(name='description',
+                                   css_class='description')]
         return result
 
+    def resources(self):
+        yield ew.CSSLink('css/merge_request.css')
+
 
 class SCMMergeRequestFilterWidget(ff.ForgeForm):
     defaults = dict(

http://git-wip-us.apache.org/repos/asf/allura/blob/80b24cf6/Allura/allura/lib/widgets/resources/css/merge_request.css
----------------------------------------------------------------------
diff --git a/Allura/allura/lib/widgets/resources/css/merge_request.css b/Allura/allura/lib/widgets/resources/css/merge_request.css
new file mode 100644
index 0000000..1fb2a91
--- /dev/null
+++ b/Allura/allura/lib/widgets/resources/css/merge_request.css
@@ -0,0 +1,7 @@
+.summary {
+    width: 30em;
+}
+.description {
+    width: 30em;
+    height: 10em;
+}


[2/2] git commit: [#7295] ticket:571 Changed text of merge request page</h2> <b>Posted by br...@apache.org.</b><hr/><pre>[#7295] ticket:571 Changed <title> text of merge request page Project: http://git-wip-us.apache.org/repos/asf/allura/repo Commit: http://git-wip-us.apache.org/repos/asf/allura/commit/b9cfb73d Tree: http://git-wip-us.apache.org/repos/asf/allura/tree/b9cfb73d Diff: http://git-wip-us.apache.org/repos/asf/allura/diff/b9cfb73d Branch: refs/heads/master Commit: b9cfb73d548f901b7221bfa76754b864c59535cc Parents: 80b24cf Author: Ferens Dmitriy <fe...@gmail.com> Authored: Mon Apr 7 15:48:53 2014 +0300 Committer: Dave Brondsema <da...@brondsema.net> Committed: Tue Apr 15 15:22:27 2014 -0400 ---------------------------------------------------------------------- Allura/allura/templates/repo/merge_request_edit.html | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/allura/blob/b9cfb73d/Allura/allura/templates/repo/merge_request_edit.html ---------------------------------------------------------------------- diff --git a/Allura/allura/templates/repo/merge_request_edit.html b/Allura/allura/templates/repo/merge_request_edit.html index 86d0420..28346d9 100644 --- a/Allura/allura/templates/repo/merge_request_edit.html +++ b/Allura/allura/templates/repo/merge_request_edit.html @@ -19,11 +19,7 @@ {% extends 'allura:templates/repo/repo_master.html' %} {% block title %} - {% if c.app.repo %} - Repository: {{c.app.repo.name}} - {% else %} - Repository - {% endif %} + {{c.project.name}} / {{c.app.config.options.mount_label}} / Request merge {% endblock %} {% block header %}Update merge request{% endblock %} </pre><hr/> </body> </html>