bigbluebutton-Github/bigbluebutton-html5/app/client/views/sharedTemplates.html
perroned 617e34cd62 Merge remote-tracking branch 'maxim/meteor-client-new-ui' into foundation-notifications
Conflicts:
	bigbluebutton-html5/app/client/views/sharedTemplates.html
2015-05-12 12:31:38 -07:00

19 lines
728 B
HTML
Executable File

<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>
{{/if}}
{{#if i_class}}
<i class="{{i_class}}" style="font-size:30px"></i>
{{/if}}
</button>
<<<<<<< HEAD
=======
{{else}} -->
<button type="submit" id="{{id}}" class="btn {{btn_class}}" {{isDisabled}} rel="{{rel}}" data-placement="{{data_placement}}" title="{{title}}">
<i class="{{i_class}}" style="font-size:30px"></i><span>{{label}}</span>
</button>
<!-- {{/if}} -->
>>>>>>> maxim/meteor-client-new-ui
</template>