Commits

Olemis Lang committed 5100d47

BH Theme #137: Button classes for wiki edit

  • Participants
  • Parent commits ac4979e
  • Branches t137_btncls2

Comments (0)

Files changed (1)

File t137/t137_r1365626_btncls_wiki.diff

 # Parent c1edf8f8744785448c3efec493905e5db065c73b
 BH Theme #137: Button classes for wiki pages
 
-diff --git a/bhtheme/htdocs/bloodhound.css b/bhtheme/htdocs/bloodhound.css
---- a/bhtheme/htdocs/bloodhound.css
-+++ b/bhtheme/htdocs/bloodhound.css
+diff -r c1edf8f87447 bhtheme/htdocs/bloodhound.css
+--- a/bhtheme/htdocs/bloodhound.css	Wed Aug 15 19:58:55 2012 -0400
++++ b/bhtheme/htdocs/bloodhound.css	Fri Aug 17 00:13:40 2012 -0400
+@@ -195,7 +195,7 @@
+ /* @group Ticket page modifications */
+ 
+ #comment {
+-  width: 605px;
++  width: 370px;
+ }
+ 
+ #field-description {
 @@ -405,6 +405,36 @@
    margin-top: 2px !important;
  }
  /* @end */
  
  /* @group Bootstrap extensions */
-diff --git a/bhtheme/templates/bh_wiki_view.html b/bhtheme/templates/bh_wiki_view.html
---- a/bhtheme/templates/bh_wiki_view.html
-+++ b/bhtheme/templates/bh_wiki_view.html
+diff -r c1edf8f87447 bhtheme/templates/bh_wiki_edit_form.html
+--- a/bhtheme/templates/bh_wiki_edit_form.html	Wed Aug 15 19:58:55 2012 -0400
++++ b/bhtheme/templates/bh_wiki_edit_form.html	Fri Aug 17 00:13:40 2012 -0400
+@@ -90,20 +90,49 @@
+       </fieldset>
+     </div>
+     <div class="btn-toolbar buttons">
++      <div class="btn-group" 
++          py:if="action != 'collision'">
++        <button class="btn btn-primary" type="submit" id="save" name="save" 
++            value="${_('Submit changes')}">
++          <i class="icon-ok icon-white"></i>
++          Submit changes
++        </button>
++      </div>
+       <div class="btn-group" py:choose="action">
+         <py:when test="'collision'">
+-          <input class="btn" type="submit" name="preview" value="${_('Preview')}" disabled="disabled" />
+-          <input class="btn" type="submit" name="merge" value="${_('Merge changes')}" accesskey="r" />
+-          <input class="btn" type="submit" name="save" value="${_('Submit changes')}" disabled="disabled" />
++          <button class="btn" type="submit" name="preview" 
++              value="${_('Preview')}" disabled="disabled">
++            <i class="icon-screenshot"></i>
++            Preview
++          </button>
++          <button class="btn" type="submit" name="merge" 
++              value="${_('Merge changes')}" accesskey="r" >
++            <i class="icon-random"></i>
++            Merge changes
++          </button>
++          <button class="btn" type="submit" name="save" value="${_('Submit changes')}" disabled="disabled">
++            <i class="icon-ok"></i>
++            Submit changes
++          </button>
+         </py:when>
+         <py:otherwise>
+-          <input class="btn" type="submit" name="preview" value="${_('Preview Page')}" accesskey="p" />
+-          <input class="btn" type="submit" name="diff" value="${_('Review Changes')}" accesskey="r" />
+-          <input class="btn" type="submit" id="save" name="save" value="${_('Submit changes')}" />
++          <button class="btn" type="submit" name="preview" 
++              value="${_('Preview Page')}" accesskey="p" >
++            <i class="icon-screenshot"></i>
++            Preview
++          </button>
++          <button class="btn" type="submit" name="diff" value="${_('Review Changes')}" accesskey="r">
++            <i class="icon-eye-open"></i>
++            Review Changes
++          </button>
+         </py:otherwise>
+       </div>
+       <div class="btn-group">
+-        <input class="btn" type="submit" name="cancel" value="${_('Cancel')}" />
++        <button class="btn-link" type="submit" name="cancel" 
++            value="${_('Cancel')}">
++          <i class="icon-ban-circle"></i>
++          Cancel
++        </button>
+       </div>
+     </div>
+   </form>
+diff -r c1edf8f87447 bhtheme/templates/bh_wiki_view.html
+--- a/bhtheme/templates/bh_wiki_view.html	Wed Aug 15 19:58:55 2012 -0400
++++ b/bhtheme/templates/bh_wiki_view.html	Fri Aug 17 00:13:40 2012 -0400
 @@ -111,14 +111,25 @@
                <div class="btn-group">
                  <py:choose>