Mercurial > kallithea

changeset 4320:486cd40776c2

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
pull requests: use html placeholders for hints in input fields
author Mads Kiilerich <madski@unity3d.com>
date Fri, 18 Jul 2014 18:44:54 +0200
parents 10cff43c7bd9
children f4c9b0f76d79
files kallithea/public/css/style.css kallithea/templates/pullrequests/pullrequest.html kallithea/templates/pullrequests/pullrequest_show.html
diffstat 3 files changed, 5 insertions(+), 8 deletions(-) [+]
line wrap: on
line diff
--- a/kallithea/public/css/style.css	Fri Jun 28 11:50:13 2013 +0200
+++ b/kallithea/public/css/style.css	Fri Jul 18 18:44:54 2014 +0200
@@ -1402,7 +1402,7 @@
 #content div.box div.form div.fields div.field div.textarea textarea {
     width: 100%;
     height: 220px;
-    overflow: hidden;
+    overflow-y: auto;
     background: #FFF;
     color: #000;
     font-size: 12px;
--- a/kallithea/templates/pullrequests/pullrequest.html	Fri Jun 28 11:50:13 2013 +0200
+++ b/kallithea/templates/pullrequests/pullrequest.html	Fri Jul 18 18:44:54 2014 +0200
@@ -31,7 +31,7 @@
                     <label for="pullrequest_title">${_('Title')}:</label>
                 </div>
                 <div class="input">
-                    ${h.text('pullrequest_title', class_="large")}
+                    ${h.text('pullrequest_title',class_="large",placeholder=_('Summarize the changes - or leave empty'))}
                 </div>
              </div>
 
@@ -40,8 +40,7 @@
                     <label for="pullrequest_desc">${_('Description')}:</label>
                 </div>
                 <div class="textarea text-area editor">
-                    ${h.textarea('pullrequest_desc',size=30, style="height:100px")}
-                    <span class="help-block">${_('Write a short description on this pull request')}</span>
+                    ${h.textarea('pullrequest_desc',size=30,placeholder=_('Write a short description on this pull request'))}
                 </div>
             </div>
 
@@ -116,8 +115,7 @@
 
               <div class='ac'>
                 <div class="reviewer_ac">
-                   ${h.text('user', class_='yui-ac-input')}
-                   <span class="help-block">${_('Add reviewer to this pull request.')}</span>
+                   ${h.text('user', class_='yui-ac-input',placeholder=_('Type name of reviewer to add'))}
                    <div id="reviewers_container"></div>
                 </div>
               </div>
--- a/kallithea/templates/pullrequests/pullrequest_show.html	Fri Jun 28 11:50:13 2013 +0200
+++ b/kallithea/templates/pullrequests/pullrequest_show.html	Fri Jul 18 18:44:54 2014 +0200
@@ -165,8 +165,7 @@
           <div class='ac'>
             %if h.HasPermissionAny('hg.admin')() or h.HasRepoPermissionAny('repository.admin')(c.repo_name) or c.pull_request.author.user_id == c.authuser.user_id:
             <div class="reviewer_ac">
-               ${h.text('user', class_='yui-ac-input')}
-               <span class="help-block">${_('Add or remove reviewer to this pull request.')}</span>
+               ${h.text('user', class_='yui-ac-input',placeholder=_('Type name of reviewer to add'))}
                <div id="reviewers_container"></div>
             </div>
             <div style="padding:0px 10px">