Commits

Olemis Lang committed bbd1398

BH Theme #137: Enhanced button classes for wiki pages

  • Participants
  • Parent commits 9661666
  • Branches t137_btncls2

Comments (0)

Files changed (1)

File t137/t137_r1365626_btncls_wiki.diff

 
 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:22:31 2012 -0400
++++ b/bhtheme/htdocs/bloodhound.css	Sun Aug 19 09:43:26 2012 -0400
 @@ -195,7 +195,7 @@
  /* @group Ticket page modifications */
  
  /* @end */
  
  /* @group Bootstrap extensions */
+diff -r c1edf8f87447 bhtheme/templates/bh_wiki_delete.html
+--- a/bhtheme/templates/bh_wiki_delete.html	Wed Aug 15 19:58:55 2012 -0400
++++ b/bhtheme/templates/bh_wiki_delete.html	Sun Aug 19 09:43:26 2012 -0400
+@@ -116,10 +116,19 @@
+             <strong>This is an irreversible operation.</strong>
+           </p>
+           <div class="control-group">
+-            <input class="btn" type="submit" name="cancel" value="${_('Cancel')}" />
+-            <input class="btn" type="submit" value="${what == 'multiple' and _('Delete those versions')
+-                                          or what == 'single' and _('Delete this version')
+-                                          or _('Delete page')}" />
++            <button class="btn" type="submit" 
++                py:with="dellbl = what == 'multiple' and _('Delete those versions')
++                         or what == 'single' and _('Delete this version')
++                         or _('Delete page')"
++                value="${dellbl}">
++              <i class="icon-trash"></i>
++              ${dellbl}
++            </button>
++            <button class="btn-link" type="submit" name="cancel" 
++                value="${_('Cancel')}">
++              <i class="icon-ban-circle"></i>
++              Cancel
++            </button>
+           </div>
+         </form>
+       </div>
 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:22:31 2012 -0400
++++ b/bhtheme/templates/bh_wiki_edit_form.html	Sun Aug 19 09:43:26 2012 -0400
 @@ -90,20 +90,49 @@
        </fieldset>
      </div>
    </form>
 diff -r c1edf8f87447 bhtheme/templates/bh_wiki_rename.html
 --- a/bhtheme/templates/bh_wiki_rename.html	Wed Aug 15 19:58:55 2012 -0400
-+++ b/bhtheme/templates/bh_wiki_rename.html	Fri Aug 17 00:22:31 2012 -0400
++++ b/bhtheme/templates/bh_wiki_rename.html	Sun Aug 19 09:43:26 2012 -0400
 @@ -49,8 +49,16 @@
            </label>
            <br/><br/>
            <div class="control-group">
 -            <input class="btn" type="submit" name="cancel" value="${_('Cancel')}"/>
 -            <input class="btn" type="submit" name="submit" value="${_('Rename page')}"/>
-+            <button class="btn btn-primary" type="submit" name="submit" 
++            <button class="btn" type="submit" name="submit" 
 +                value="${_('Rename page')}">
-+              <i class="icon-ok icon-white"></i>
++              <i class="icon-ok"></i>
 +              Rename page
 +            </button>
 +            <button class="btn-link" type="submit" name="cancel" 
        </div>
 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:22:31 2012 -0400
++++ b/bhtheme/templates/bh_wiki_view.html	Sun Aug 19 09:43:26 2012 -0400
 @@ -111,14 +111,25 @@
                <div class="btn-group">
                  <py:choose>