Unified the button structure and added a tooltip to the hamburger but…

…ton.
bigbluebutton · Jul 2, 2015 · 50a2b79 · 50a2b79
1 parent e765987
commit 50a2b79
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 12 deletions.
diff --git a/bigbluebutton-html5/app/client/main.html b/bigbluebutton-html5/app/client/main.html
@@ -1,8 +1,6 @@
 <template name="header">
   <nav id="navbar" class="myNavbar gradientBar top-bar" role="navigation">
-    <button class="btn toggleUserlistButton navbarButton sl-hamburger sl-ham-la-cw sl-portrait-mobile sl-portrait-keyboard">
-      <span></span>
-    </button>
+    {{> makeButton btn_class="btn toggleUserlistButton navbarButton sl-hamburger sl-ham-la-cw sl-portrait-mobile sl-portrait-keyboard" rel="tooltip" title="Toggle Userlist" span=true}}
 
     {{#if amIInAudio}}
       {{#if amIListenOnlyAudio}}

diff --git a/bigbluebutton-html5/app/client/views/modals/modals.html b/bigbluebutton-html5/app/client/views/modals/modals.html
@@ -46,12 +46,12 @@
 
   <div class="bar bottomBar">
     <a href="#" class="closeSettings close-reveal-modal"><u>Cancel</u></a>
-    {{> makeButton id="saveSettings" btn_class="settingsButton" rel="tooltip" title="Save Changes" text="Save"}}
+    {{> makeButton id="saveSettings" btn_class="settingsButton" rel="tooltip" title="Save Changes" label="Save"}}
   </div>
 </template>
 
 <template name="logoutModal">
   <p>Are you sure you want to logout?</p>
-  {{> makeButton id="yes" btn_class="logoutButton" rel="tooltip" title="Logout" text="Yes"}}
-  {{> makeButton id="no" btn_class="logoutButton" rel="tooltip" title="Logout" text="No"}}
+  {{> makeButton id="yes" btn_class="logoutButton" rel="tooltip" title="Logout" label="Yes"}}
+  {{> makeButton id="no" btn_class="logoutButton" rel="tooltip" title="Logout" label="No"}}
 </template>
diff --git a/bigbluebutton-html5/app/client/views/sharedTemplates.html b/bigbluebutton-html5/app/client/views/sharedTemplates.html
@@ -1,11 +1,13 @@
 <template name="makeButton">
     <button type="submit" id="{{id}}" class="btn {{btn_class}}" {{isDisabled}} rel="{{rel}}" data-placement="{{data_placement}}" title="{{title}}" style="{{style}}">
-      {{#if text}}
-        <span>{{text}}</span>
-      {{else}}
-        {{#if i_class}}
-          <i class="{{i_class}}"></i><span>{{label}}</span>
-        {{/if}}
+      {{#if i_class}}
+        <i class="{{i_class}}"></i>
+      {{/if}}
+      {{#if label}}
+        <span>{{label}}</span>
+      {{/if}}
+      {{#if span}}
+        <span></span>
       {{/if}}
     </button>
 </template>