فهرست منبع

HUE-915 [core] Uniform modal dialogs

Moved all the action buttons to the right
Removed 'secondary' classes and converted 'primary' to 'btn-primary'
Added 'btn-danger' class to destructive actions (delete)
Added a couple of forgotten i18n strings
Enrico Berti 13 سال پیش
والد
کامیت
3d45edb
34فایلهای تغییر یافته به همراه184 افزوده شده و 161 حذف شده
  1. 1 1
      apps/beeswax/src/beeswax/templates/beeswax_components.mako
  2. 1 1
      apps/beeswax/src/beeswax/templates/choose_delimiter.mako
  3. 1 1
      apps/beeswax/src/beeswax/templates/choose_file.mako
  4. 1 1
      apps/beeswax/src/beeswax/templates/configuration.mako
  5. 2 2
      apps/beeswax/src/beeswax/templates/create_table_manually.mako
  6. 1 1
      apps/beeswax/src/beeswax/templates/define_columns.mako
  7. 96 80
      apps/beeswax/src/beeswax/templates/describe_table.mako
  8. 15 8
      apps/beeswax/src/beeswax/templates/execute.mako
  9. 4 4
      apps/beeswax/src/beeswax/templates/index.mako
  10. 2 2
      apps/beeswax/src/beeswax/templates/list_designs.mako
  11. 2 2
      apps/beeswax/src/beeswax/templates/my_queries.mako
  12. 1 1
      apps/beeswax/src/beeswax/templates/save_results.mako
  13. 4 4
      apps/beeswax/src/beeswax/templates/show_tables.mako
  14. 2 2
      apps/beeswax/src/beeswax/templates/watch_results.mako
  15. 2 2
      apps/filebrowser/src/filebrowser/templates/edit.mako
  16. 1 1
      apps/filebrowser/src/filebrowser/templates/fileop.mako
  17. 7 7
      apps/filebrowser/src/filebrowser/templates/listdir_components.mako
  18. 1 1
      apps/jobbrowser/src/jobbrowser/templates/jobs.mako
  19. 6 6
      apps/jobsub/src/jobsub/templates/list_designs.mako
  20. 3 3
      apps/oozie/src/oozie/templates/dashboard/list_oozie_coordinator.mako
  21. 3 3
      apps/oozie/src/oozie/templates/dashboard/list_oozie_coordinators.mako
  22. 3 3
      apps/oozie/src/oozie/templates/dashboard/list_oozie_workflow.mako
  23. 3 3
      apps/oozie/src/oozie/templates/dashboard/list_oozie_workflows.mako
  24. 1 1
      apps/oozie/src/oozie/templates/editor/action_utils.mako
  25. 2 2
      apps/oozie/src/oozie/templates/editor/control_utils.mako
  26. 2 2
      apps/oozie/src/oozie/templates/editor/edit_workflow.mako
  27. 2 2
      apps/oozie/src/oozie/templates/editor/import_workflow_action.mako
  28. 2 2
      apps/oozie/src/oozie/templates/editor/list_coordinators.mako
  29. 4 4
      apps/oozie/src/oozie/templates/editor/list_workflows.mako
  30. 2 2
      apps/oozie/src/oozie/templates/editor/submit_job_popup.mako
  31. 2 2
      apps/useradmin/src/useradmin/templates/delete_group.mako
  32. 2 2
      apps/useradmin/src/useradmin/templates/delete_user.mako
  33. 1 1
      apps/useradmin/src/useradmin/templates/sync_ldap_users_groups.mako
  34. 2 2
      desktop/core/src/desktop/templates/login.mako

+ 1 - 1
apps/beeswax/src/beeswax/templates/beeswax_components.mako

@@ -149,7 +149,7 @@ ${field.label_tag() | n}
             ${unicode(field) | n}
         % else:
             % if tag == 'textarea':
-                <textarea name="${field.html_name | n}" ${make_attr_str(attrs) | n} />${extract_field_data(field) or ''}</textarea>
+                <textarea name="${field.html_name | n}" ${make_attr_str(attrs) | n} class="${cls}" />${extract_field_data(field) or ''}</textarea>
             % elif tag == 'button':
                 <button name="${field.html_name | n}" ${make_attr_str(attrs) | n} value="${value}"/>${button_text or field.name or ''}</button>
             % elif tag == 'checkbox':

+ 1 - 1
apps/beeswax/src/beeswax/templates/choose_delimiter.mako

@@ -91,7 +91,7 @@ ${layout.menubar(section='tables')}
 
                 <div class="form-actions">
                     <input class="btn" type="submit" value="${_('Previous')}" name="cancel_delim"/>
-                    <input class="btn primary" type="submit" name="submit_delim" value="${_('Next')}" />
+                    <input class="btn btn-primary" type="submit" name="submit_delim" value="${_('Next')}" />
                 </div>
             </form>
         </div>

+ 1 - 1
apps/beeswax/src/beeswax/templates/choose_file.mako

@@ -97,7 +97,7 @@ ${layout.menubar(section='tables')}
                     </div>
                 </fieldset>
                 <div class="form-actions">
-                    <input type="submit" class="btn primary" name="submit_file" value="${_('Next')}" />
+                    <input type="submit" class="btn btn-primary" name="submit_file" value="${_('Next')}" />
                 </div>
             </form>
         </div>

+ 1 - 1
apps/beeswax/src/beeswax/templates/configuration.mako

@@ -29,7 +29,7 @@ ${layout.menubar(section='configuration')}
 		<form class="form-search" method="POST">
 		  <span>
 		    ${server_form['server']}
-		    <button type="submit" class="btn primary">${_('Look')}</button>
+		    <button type="submit" class="btn btn-primary">${_('Look')}</button>
 		   </span>
 		   <span class="pull-right">
               ${_('Filter:')} <input type="text" id="filterInput" class="input-xlarge search-query" placeholder="${_('Search for key, value, etc...')}">

+ 2 - 2
apps/beeswax/src/beeswax/templates/create_table_manually.mako

@@ -301,8 +301,8 @@ ${layout.menubar(section='tables')}
 </div>
 <div class="form-actions">
     <button type="button" id="backBtn" class="btn hide">${_('Back')}</button>
-    <button type="button" id="nextBtn" class="btn primary">${_('Next')}</button>
-    <input id="submit" type="submit" class="btn primary hide" value="${_('Create table')}" />
+    <button type="button" id="nextBtn" class="btn btn-primary">${_('Next')}</button>
+    <input id="submit" type="submit" class="btn btn-primary hide" value="${_('Create table')}" />
 </div>
 </form>
 </div>

+ 1 - 1
apps/beeswax/src/beeswax/templates/define_columns.mako

@@ -90,7 +90,7 @@ ${layout.menubar(section='tables')}
                 </fieldset>
                 <div class="form-actions">
                     <input class="btn" type="submit" name="cancel_create" value="${_('Previous')}" />
-                    <input class="btn primary" type="submit" name="submit_create" value="${_('Create Table')}" />
+                    <input class="btn btn-primary" type="submit" name="submit_create" value="${_('Create Table')}" />
                 </div>
             </form>
         </div>

+ 96 - 80
apps/beeswax/src/beeswax/templates/describe_table.mako

@@ -130,12 +130,12 @@ ${layout.menubar(section='tables')}
         <h3>${_('Drop Table')}</h3>
     </div>
     <div class="modal-body">
-      <div id="dropTableMessage" class="alert">
+      <div id="dropTableMessage">
       </div>
     </div>
     <div class="modal-footer">
-        <input type="submit" class="btn primary" value="${_('Yes')}"/>
-        <a href="#" class="btn secondary hideModal">${_('No')}</a>
+        <input type="button" class="btn" data-dismiss="modal" value="${_('Cancel')}" />
+        <input type="submit" class="btn btn-danger" value="${_('Yes, drop this table')}"/>
     </div>
     </form>
 </div>
@@ -143,107 +143,123 @@ ${layout.menubar(section='tables')}
 
 
 <div id="importData" class="modal hide fade">
-    <form method="POST" action="${ url("beeswax.views.load_table", table=table.name) }" class="form-stacked">
+    <form method="POST" action="${ url("beeswax.views.load_table", table=table.name) }" class="form-horizontal">
         <div class="modal-header">
             <a href="#" class="close" data-dismiss="modal">&times;</a>
             <h3>${_('Import data')}</h3>
         </div>
         <div class="modal-body">
-            <div class="alert">
-                  <p>${_("Note that loading data will move data from its location into the table's storage location.")}</p>
-            </div>
 
-            <div class="clearfix">
-                ${comps.label(load_form["path"], title_klass='loadPath', attrs={})}
-                <div class="input">
-                    ${comps.field(load_form["path"], title_klass='loadPath', attrs={'klass': 'loadPath input-xlarge'})}
+            <div class="control-group">
+                ${comps.bootstrapLabel(load_form["path"])}
+                <div class="controls">
+                    ${comps.field(load_form["path"],
+                    placeholder="/user/user_name/data_dir/file",
+                    klass="pathChooser input-xlarge",
+                    file_chooser=True,
+                    show_errors=False
+                    )}
                 </div>
             </div>
 
+            <div id="filechooser"></div>
+
             % for pf in load_form.partition_columns:
-                <div class="clearfix">
-                     ${comps.label(load_form[pf], render_default=True)}
-                     <div class="input">
+                <div class="control-group">
+                     ${comps.bootstrapLabel(load_form[pf])}
+                     <div class="controls">
                        ${comps.field(load_form[pf], render_default=True, attrs={'klass': 'input-xlarge'})}
                     </div>
                 </div>
             % endfor
 
-            <div class="clearfix">
-                <div class="input">
+            <div class="control-group">
+              <div class="controls">
+                <label class="checkbox">
                     <input type="checkbox" name="overwrite"/> ${_('Overwrite existing data')}
+                  </label>
                 </div>
             </div>
 
-            <div id="filechooser"></div>
+            <p class="muted"><em>${_("Note that loading data will move data from its location into the table's storage location.")}</em></p>
         </div>
 
         <div class="modal-footer">
-            <input type="submit" class="btn primary" value="${_('Submit')}"/>
-            <a href="#" class="btn secondary" data-dismiss="modal">${_('Cancel')}</a>
+            <a href="#" class="btn" data-dismiss="modal">${_('Cancel')}</a>
+            <input type="submit" class="btn btn-primary" value="${_('Submit')}"/>
         </div>
     </form>
 </div>
 </div>
 
-<style>
-    #filechooser {
-        display:none;
-        min-height:100px;
-        overflow-y:scroll;
-        margin-top:10px;
-    }
-
-    .sampleTable td, .sampleTable th {
-      white-space: nowrap;
-    }
-</style>
-
-<script type="text/javascript" charset="utf-8">
-    $(document).ready(function(){
-        $("#filechooser").jHueFileChooser({
-            initialPath: $(".loadPath").val(),
-            onFileChoose: function(filePath){
-                $(".loadPath").val(filePath);
-                $("#filechooser").slideUp();
-            },
-            createFolder: false
-        });
-        $(".datatables").dataTable({
-            "bPaginate": false,
-            "bLengthChange": false,
-            "bInfo": false,
-            "bFilter": false
-        });
-
-        $.getJSON("${ url("beeswax.views.drop_table", table=table.name) }", function(data){
-            $("#dropTableMessage").text(data.title);
-        });
-        $(".hideModal").click(function(){
-            $(this).closest(".modal").modal("hide");
-        });
-        $(".loadPath").click(function(){
-            $("#filechooser").slideDown();
-        });
-
-      $('a[data-toggle="tab"]').on('shown', function () {
-        $(".sampleTable").not('.initialized').addClass('initialized').dataTable({
-          "bPaginate": false,
-          "bLengthChange": false,
-          "bInfo": false,
-          "bFilter": false,
-          "fnInitComplete": function () {
-            $(".sampleTable").parent().jHueTableScroller();
-            $(".sampleTable").jHueTableExtender({
-              hintElement: "#jumpToColumnAlert",
-              fixedHeader: true
-            });
-          }
-        });
-      })
-
-
-    });
-</script>
-
-${commonfooter(messages)}
+ <style>
+   #filechooser {
+     display: none;
+     min-height: 100px;
+     height: 250px;
+     overflow-y: scroll;
+     margin-top: 10px;
+   }
+
+   .sampleTable td, .sampleTable th {
+     white-space: nowrap;
+   }
+
+   .form-horizontal .controls {
+     margin-left: 0;
+   }
+
+   .form-horizontal .control-label {
+     width: auto;
+     padding-right: 10px;
+   }
+ </style>
+
+ <script type="text/javascript" charset="utf-8">
+   $(document).ready(function () {
+
+     $(".fileChooserBtn").click(function(e){
+       e.preventDefault();
+       var _destination = $(this).attr("data-filechooser-destination");
+       $("#filechooser").jHueFileChooser({
+         initialPath: $("input[name='"+_destination+"']").val(),
+         onFileChoose: function(filePath){
+           $("input[name='"+_destination+"']").val(filePath);
+           $("#filechooser").slideUp();
+         },
+         createFolder: false
+       });
+       $("#filechooser").slideDown();
+     });
+
+     $(".datatables").dataTable({
+       "bPaginate":false,
+       "bLengthChange":false,
+       "bInfo":false,
+       "bFilter":false
+     });
+
+     $.getJSON("${ url("beeswax.views.drop_table", table=table.name) }", function (data) {
+       $("#dropTableMessage").text(data.title);
+     });
+
+     $('a[data-toggle="tab"]').on('shown', function () {
+       $(".sampleTable").not('.initialized').addClass('initialized').dataTable({
+         "bPaginate":false,
+         "bLengthChange":false,
+         "bInfo":false,
+         "bFilter":false,
+         "fnInitComplete":function () {
+           $(".sampleTable").parent().jHueTableScroller();
+           $(".sampleTable").jHueTableExtender({
+             hintElement:"#jumpToColumnAlert",
+             fixedHeader:true
+           });
+         }
+       });
+     })
+
+   });
+ </script>
+
+ ${commonfooter(messages)}

+ 15 - 8
apps/beeswax/src/beeswax/templates/execute.mako

@@ -49,7 +49,7 @@
     </fieldset>
 
     <div class="actions">
-        <a id="executeQuery" class="btn primary">${_('Execute')}</a>
+        <a id="executeQuery" class="btn btn-primary">${_('Execute')}</a>
         % if design and not design.is_auto and design.name:
         <a id="saveQuery" class="btn">${_('Save')}</a>
         % endif
@@ -270,17 +270,24 @@ ${layout.menubar(section='query')}
         <h3>${_('Choose a name')}</h3>
     </div>
     <div class="modal-body">
-        <div class="clearfix">
-            <label>${_('Name')}</label>
-            ${comps.field(form.saveform['name'])}
+      <form class="form-horizontal">
+        <div class="control-group">
+            <label class="control-label">${_('Name')}</label>
+            <div class="controls">
+              ${comps.field(form.saveform['name'], klass="input-xlarge")}
+            </div>
         </div>
-        <div class="clearfix">
-            <label>Description</label>
-            ${comps.field(form.saveform['desc'])}
+        <div class="control-group">
+            <label class="control-label">${_('Description')}</label>
+            <div class="controls">
+            ${comps.field(form.saveform['desc'], tag='textarea', klass="input-xlarge")}
+            </div>
         </div>
+      </form>
     </div>
     <div class="modal-footer">
-        <button id="saveAsNameBtn" class="btn primary">${_('Save')}</button>
+        <button class="btn" data-dismiss="modal">${_('Cancel')}</button>
+        <button id="saveAsNameBtn" class="btn btn-primary">${_('Save')}</button>
     </div>
 </div>
 

+ 4 - 4
apps/beeswax/src/beeswax/templates/index.mako

@@ -60,11 +60,11 @@ ${layout.menubar(section='tables')}
         <h3>${_('Install samples')}</h3>
     </div>
     <div class="modal-body">
-      <div id="installSamplesMessage" class="alert"></div>
+      <div id="installSamplesMessage"></div>
     </div>
     <div class="modal-footer">
-        <a href="#" id="installSamplesBtn" class="btn primary">${_('Yes')}</a>
-        <a href="#" class="btn secondary" data-dismiss="modal">${_('No')}</a>
+        <a href="#" class="btn" data-dismiss="modal">${_('Cancel')}</a>
+        <a href="#" id="installSamplesBtn" class="btn btn-primary">${_('Yes, install samples')}</a>
     </div>
 </div>
 
@@ -85,7 +85,7 @@ ${layout.menubar(section='tables')}
                     }
                     else {
                         var message = "${_('There was an error processing your request:')} " + result.message;
-                        $("#installSamplesMessage").addClass("alert-error").text(message);
+                        $("#installSamplesMessage").addClass("alert").addClass("alert-error").text(message);
                     }
                 }
             );

+ 2 - 2
apps/beeswax/src/beeswax/templates/list_designs.mako

@@ -92,8 +92,8 @@ ${layout.menubar(section='saved queries')}
             <h3 id="deleteQueryMessage">${_('Confirm action')}</h3>
         </div>
         <div class="modal-footer">
-            <input type="submit" class="btn primary" value="${_('Yes')}"/>
-            <a href="#" class="btn secondary" data-dismiss="modal">${_('No')}</a>
+            <input type="button" class="btn" data-dismiss="modal" value="${_('Cancel')}" />
+            <input type="submit" class="btn btn-danger" value="${_('Yes')}"/>
         </div>
     </form>
 </div>

+ 2 - 2
apps/beeswax/src/beeswax/templates/my_queries.mako

@@ -163,8 +163,8 @@ ${layout.menubar(section='my queries')}
         <h3 id="deleteQueryMessage">${_('Confirm action')}</h3>
     </div>
     <div class="modal-footer">
-        <input type="submit" class="btn primary" value="${_('Yes')}"/>
-        <a href="#" class="btn secondary" data-dismiss="modal">${_('No')}</a>
+        <input type="button" class="btn" data-dismiss="modal" value="${_('Cancel')}" />
+        <input type="submit" class="btn btn-danger" value="${_('Yes')}"/>
     </div>
     </form>
 </div>

+ 1 - 1
apps/beeswax/src/beeswax/templates/save_results.mako

@@ -45,7 +45,7 @@ ${layout.menubar(section='history')}
     <a href="#" class="close" data-dismiss="modal">&times;</a>
   </div>
   <br/><br/>
-  <input type="submit" name="save" value="${_('Save')}" class="btn primary"/>
+  <input type="submit" name="save" value="${_('Save')}" class="btn btn-primary"/>
   <input type="submit" name="cancel" value="${_('Cancel')}" class="btn"/>
 </form>
 </div>

+ 4 - 4
apps/beeswax/src/beeswax/templates/show_tables.mako

@@ -68,13 +68,13 @@ ${layout.menubar(section='tables')}
 		<h3>${_('Install samples')}</h3>
 	</div>
 	<div class="modal-body">
-	  <div id="installSamplesMessage" class="alert">
+	  <div id="installSamplesMessage">
 
 	  </div>
 	</div>
 	<div class="modal-footer">
-		<a href="#" id="installSamplesBtn" class="btn primary">${_('Yes')}</a>
-		<a href="#" class="btn secondary" data-dismiss="modal">${_('No')}</a>
+		<a href="#" class="btn" data-dismiss="modal">${_('Cancel')}</a>
+		<a href="#" id="installSamplesBtn" class="btn btn-primary">${_('Yes, install samples')}</a>
 	</div>
 </div>
 % endif
@@ -109,7 +109,7 @@ ${layout.menubar(section='tables')}
                     }
                     else {
                         var message = "${_('There was an error processing your request:')} " + result.message;
-                        $("#installSamplesMessage").addClass("alert-error").text(message);
+                        $("#installSamplesMessage").addClass("alert").addClass("alert-error").text(message);
                     }
                 }
             );

+ 2 - 2
apps/beeswax/src/beeswax/templates/watch_results.mako

@@ -193,9 +193,9 @@ ${layout.menubar(section='query')}
       <div id="fieldRequired" class="hide" style="position: absolute; left: 10;">
         <span class="label label-important">${_('Sorry, name is required.')}</span>
       </div>
-      <a id="saveBtn" class="btn primary">${_('Save')}</a>
-      <input type="hidden" name="save" value="save"/>
       <a class="btn" data-dismiss="modal">${_('Cancel')}</a>
+      <a id="saveBtn" class="btn btn-primary">${_('Save')}</a>
+      <input type="hidden" name="save" value="save"/>
     </div>
   </form>
   </div>

+ 2 - 2
apps/filebrowser/src/filebrowser/templates/edit.mako

@@ -56,7 +56,7 @@ ${commonheader(_('%(filename)s - File Viewer') % dict(filename=truncate(filename
 
         <div style="width: 100%; height: 100%;">${edit.render_field(form["contents"], tag="textarea", notitle=True, attrs=dict(
           style="width:100%; height:400px;")) | n}</div>
-        <input class="btn primary" type="submit" name="save" value="${_('Save')}">
+        <input class="btn btn-primary" type="submit" name="save" value="${_('Save')}">
         <a id="saveAsBtn" class="btn">${_('Save As')}</a>
     </form>
 </div>
@@ -78,8 +78,8 @@ ${commonheader(_('%(filename)s - File Viewer') % dict(filename=truncate(filename
         </div>
 		${edit.render_field(form["contents"], hidden=True)}
 		${edit.render_field(form["encoding"], hidden=True)}
-        <input type="submit" value="${_('Save')}" class="btn primary" />
         <a id="cancelSaveAsBtn" class="btn">${_('Cancel')}</a>
+        <input type="submit" value="${_('Save')}" class="btn btn-primary" />
     </div>
     </form>
 </div>

+ 1 - 1
apps/filebrowser/src/filebrowser/templates/fileop.mako

@@ -40,7 +40,7 @@ ${commonheader(_('File Operation'), 'filebrowser', user)}
 	${form.management_form}
 % endif
 <div>
-<input type="submit" value="${('Submit')}" class="btn primary" />
+<input type="submit" value="${('Submit')}" class="btn btn-primary" />
 <a href="${urlencode(next)}" class="btn">${('Cancel')}</a>
 </div>
 </form>

+ 7 - 7
apps/filebrowser/src/filebrowser/templates/listdir_components.mako

@@ -139,8 +139,8 @@ from django.utils.translation import ugettext as _
         </div>
         <div class="modal-footer">
             <form id="deleteForm" action="/filebrowser/rmtree" method="POST" enctype="multipart/form-data" class="form-stacked">
-                <input type="submit" value="${_('Yes')}" class="btn primary" />
                 <a id="cancelDeleteBtn" class="btn">${_('No')}</a>
+                <input type="submit" value="${_('Yes')}" class="btn btn-danger" />
             </form>
         </div>
     </div>
@@ -162,7 +162,7 @@ from django.utils.translation import ugettext as _
 
             <input id="renameSrcPath" type="hidden" name="src_path" type="text">
             <a id="cancelRenameBtn" class="btn">${_('Cancel')}</a>
-            <input type="submit" value="${_('Submit')}" class="btn primary" />
+            <input type="submit" value="${_('Submit')}" class="btn btn-primary" />
         </div>
         </form>
     </div>
@@ -196,7 +196,7 @@ from django.utils.translation import ugettext as _
                     <span class="label label-important">${_('Sorry, name is required.')}</span>
                 </div>
                 <a class="btn" onclick="$('#changeOwnerModal').modal('hide');">${_('Cancel')}</a>
-                <input class="btn primary" type="submit" value="${_('Submit')}" />
+                <input class="btn btn-primary" type="submit" value="${_('Submit')}" />
             </div>
         </form>
     </div>
@@ -259,7 +259,7 @@ from django.utils.translation import ugettext as _
             </div>
             <div class="modal-footer" style="padding-top: 10px;">
                 <a class="btn" onclick="$('#changePermissionModal').modal('hide');">${_('Cancel')}</a>
-                <input class="btn primary" type="submit" value="${_('Submit')}"/>
+                <input class="btn btn-primary" type="submit" value="${_('Submit')}"/>
             </div>
         </form>
     </div>
@@ -285,7 +285,7 @@ from django.utils.translation import ugettext as _
                     <span class="label label-important">${_('Sorry, name is required.')}</span>
                 </div>
                 <a class="btn" onclick="$('#moveModal').modal('hide');">${_('Cancel')}</a>
-                <input class="btn primary" type="submit" value="${_('Submit')}"/>
+                <input class="btn btn-primary" type="submit" value="${_('Submit')}"/>
             </div>
         </form>
     </div>
@@ -339,7 +339,7 @@ from django.utils.translation import ugettext as _
                 <p><strong>${_('Sorry, directory name is required.')}</strong>
             </div>
             <a id="cancelCreateDirectoryBtn" class="btn" href="#">${_('Cancel')}</a>
-            <input class="btn primary" type="submit" value="${_('Submit')}" />
+            <input class="btn btn-primary" type="submit" value="${_('Submit')}" />
         </div>
         </form>
     </div>
@@ -360,7 +360,7 @@ from django.utils.translation import ugettext as _
                 <p><strong>${_('Sorry, file name is required.')}</strong>
             </div>
             <a id="cancelCreateFileBtn" class="btn" href="#">${_('Cancel')}</a>
-            <input class="btn primary" type="submit" value="${_('Submit')}" />
+            <input class="btn btn-primary" type="submit" value="${_('Submit')}" />
         </div>
         </form>
     </div>

+ 1 - 1
apps/jobbrowser/src/jobbrowser/templates/jobs.mako

@@ -175,8 +175,8 @@ ${commonheader(_('Job Browser'), "jobbrowser", user)}
     </div>
     <div class="modal-footer">
         <form id="kill-job" action="" method="POST" class="form-stacked">
-            <input type="submit" value="${_('Yes')}" class="btn primary" />
             <a id="cancelKillBtn" class="btn">${_('No')}</a>
+            <input type="submit" value="${_('Yes')}" class="btn btn-danger" />
         </form>
     </div>
 </div>

+ 6 - 6
apps/jobsub/src/jobsub/templates/list_designs.mako

@@ -102,8 +102,8 @@ ${layout()}
             </fieldset>
         </div>
         <div class="modal-footer">
-            <input id="submitBtn" type="submit" class="btn primary" value="${_('Submit')}"/>
-            <a href="#" class="btn secondary" data-dismiss="modal">${_('Cancel')}</a>
+            <a href="#" class="btn" data-dismiss="modal">${_('Cancel')}</a>
+            <input id="submitBtn" type="submit" class="btn btn-primary" value="${_('Submit')}"/>
         </div>
     </form>
 </div>
@@ -115,8 +115,8 @@ ${layout()}
             <h3 id="deleteWfMessage">${_('Delete this design?')}</h3>
         </div>
         <div class="modal-footer">
-            <input type="submit" class="btn primary" value="${_('Yes')}"/>
-            <a href="#" class="btn secondary" data-dismiss="modal">${_('No')}</a>
+            <a href="#" class="btn" data-dismiss="modal">${_('No')}</a>
+            <input type="submit" class="btn btn-danger" value="${_('Yes')}"/>
         </div>
     </form>
 </div>
@@ -131,8 +131,8 @@ ${layout()}
             ${_('It will take a few seconds to install.')}
         </div>
         <div class="modal-footer">
-            <input type="submit" class="btn primary" value="${_('Yes')}"/>
-            <a href="#" class="btn secondary" data-dismiss="modal">${_('No')}</a>
+            <a href="#" class="btn" data-dismiss="modal">${_('No')}</a>
+            <input type="submit" class="btn btn-primary" value="${_('Yes')}"/>
         </div>
     </form>
 </div>

+ 3 - 3
apps/oozie/src/oozie/templates/dashboard/list_oozie_coordinator.mako

@@ -230,8 +230,8 @@ ${ layout.menubar(section='dashboard') }
     <h3 class="message"></h3>
   </div>
   <div class="modal-footer">
-    <a class="btn primary" href="javascript:void(0);">${_('Yes')}</a>
-    <a href="#" class="btn secondary" data-dismiss="modal">${_('No')}</a>
+    <a href="#" class="btn" data-dismiss="modal">${_('No')}</a>
+    <a class="btn btn-primary" href="javascript:void(0);">${_('Yes')}</a>
   </div>
 </div>
 
@@ -242,7 +242,7 @@ ${ layout.menubar(section='dashboard') }
     var _this = $(this);
     $("#confirmation .message").text(_this.attr("data-confirmation-message"));
     $("#confirmation").modal("show");
-    $("#confirmation a.primary").click(function() {
+    $("#confirmation a.btn-primary").click(function() {
       _this.trigger('confirmation');
     });
   });

+ 3 - 3
apps/oozie/src/oozie/templates/dashboard/list_oozie_coordinators.mako

@@ -146,8 +146,8 @@ ${layout.menubar(section='dashboard')}
     <h3 class="message"></h3>
   </div>
   <div class="modal-footer">
-    <a class="btn primary" href="javascript:void(0);">${_('Yes')}</a>
-    <a href="#" class="btn secondary" data-dismiss="modal">${_('No')}</a>
+    <a href="#" class="btn" data-dismiss="modal">${_('No')}</a>
+    <a class="btn btn-primary" href="javascript:void(0);">${_('Yes')}</a>
   </div>
 </div>
 
@@ -289,7 +289,7 @@ ${layout.menubar(section='dashboard')}
       var _this = $(this);
       $("#confirmation .message").text(_this.attr("data-confirmation-message"));
       $("#confirmation").modal("show");
-      $("#confirmation a.primary").click(function() {
+      $("#confirmation a.btn-primary").click(function() {
         _this.trigger('confirmation');
       });
     });

+ 3 - 3
apps/oozie/src/oozie/templates/dashboard/list_oozie_workflow.mako

@@ -284,8 +284,8 @@ ${ layout.menubar(section='dashboard') }
     <h3 class="message"></h3>
   </div>
   <div class="modal-footer">
-    <a class="btn primary" href="javascript:void(0);">${_('Yes')}</a>
-    <a href="#" class="btn secondary" data-dismiss="modal">${_('No')}</a>
+    <a href="#" class="btn" data-dismiss="modal">${_('No')}</a>
+    <a class="btn btn-primary" href="javascript:void(0);">${_('Yes')}</a>
   </div>
 </div>
 
@@ -301,7 +301,7 @@ ${ layout.menubar(section='dashboard') }
       var _this = $(this);
       $("#confirmation .message").text(_this.attr("data-confirmation-message"));
       $("#confirmation").modal("show");
-      $("#confirmation a.primary").click(function() {
+      $("#confirmation a.btn-primary").click(function() {
         _this.trigger('confirmation');
       });
     });

+ 3 - 3
apps/oozie/src/oozie/templates/dashboard/list_oozie_workflows.mako

@@ -148,8 +148,8 @@ ${ layout.menubar(section='dashboard') }
     <h3 class="message"></h3>
   </div>
   <div class="modal-footer">
-    <a class="btn primary" href="javascript:void(0);">${_('Yes')}</a>
-    <a href="#" class="btn secondary" data-dismiss="modal">${_('No')}</a>
+    <a href="#" class="btn" data-dismiss="modal">${_('No')}</a>
+    <a class="btn btn-primary" href="javascript:void(0);">${_('Yes')}</a>
   </div>
 </div>
 
@@ -284,7 +284,7 @@ ${ layout.menubar(section='dashboard') }
       var _this = $(this);
       $("#confirmation .message").text(_this.attr("data-confirmation-message"));
       $("#confirmation").modal("show");
-      $("#confirmation a.primary").click(function() {
+      $("#confirmation a.btn-primary").click(function() {
         _this.trigger('confirmation');
       });
     });

+ 1 - 1
apps/oozie/src/oozie/templates/editor/action_utils.mako

@@ -181,7 +181,7 @@
       </div>
 
       <div class="modal-footer">
-        <button data-dismiss="modal" class="btn btn-primary">Done</button>
+        <button data-dismiss="modal" class="btn btn-primary">${ _('Done')}</button>
       </div>
 
     </form>

+ 2 - 2
apps/oozie/src/oozie/templates/editor/control_utils.mako

@@ -41,7 +41,7 @@
       </div>
 
       <div class="modal-footer">
-        <button data-dismiss="modal" class="btn">No</button>
+        <button data-dismiss="modal" class="btn">${ _('No')}</button>
         % if 'convert' in javascript_attrs:
           <button data-dismiss="modal" class="btn btn-primary" data-bind="click: ${ javascript_attrs['convert'] }">${ _('Yes') }</button>
         % endif
@@ -142,7 +142,7 @@
       </div>
 
       <div class="modal-footer">
-        <button data-dismiss="modal" class="btn btn-primary">Done</button>
+        <button data-dismiss="modal" class="btn btn-primary">${ _('Done')}</button>
       </div>
 
     </form>

+ 2 - 2
apps/oozie/src/oozie/templates/editor/edit_workflow.mako

@@ -246,8 +246,8 @@ ${ layout.menubar(section='workflows') }
     <h3 class="message"></h3>
   </div>
   <div class="modal-footer">
-    <a class="btn primary" href="javascript:void(0);">${_('Yes')}</a>
-    <a href="#" class="btn secondary" data-dismiss="modal">${_('No')}</a>
+    <a href="#" class="btn" data-dismiss="modal">${_('No')}</a>
+    <a class="btn btn-primary" href="javascript:void(0);">${_('Yes')}</a>
   </div>
 </div>
 

+ 2 - 2
apps/oozie/src/oozie/templates/editor/import_workflow_action.mako

@@ -55,8 +55,8 @@
     </div>
   </div>
   <div class="modal-footer">
-    <a href="#" class="btn secondary" data-dismiss="modal">${_('Cancel')}</a>
-    <input type="submit" class="btn primary" value="${_('Import')}"/>
+    <a href="#" class="btn" data-dismiss="modal">${_('Cancel')}</a>
+    <input type="submit" class="btn btn-primary" value="${_('Import')}"/>
   </div>
 </form>
 

+ 2 - 2
apps/oozie/src/oozie/templates/editor/list_coordinators.mako

@@ -112,8 +112,8 @@ ${ layout.menubar(section='coordinators') }
       <h3 id="deleteWfMessage">${ _('Delete this coordinator?') }</h3>
     </div>
     <div class="modal-footer">
-      <input type="submit" class="btn primary" value="${ _('Yes') }"/>
-      <a href="#" class="btn secondary" data-dismiss="modal">${ _('No') }</a>
+      <a href="#" class="btn" data-dismiss="modal">${ _('No') }</a>
+      <input type="submit" class="btn btn-danger" value="${ _('Yes') }"/>
     </div>
   </form>
 </div>

+ 4 - 4
apps/oozie/src/oozie/templates/editor/list_workflows.mako

@@ -113,8 +113,8 @@ ${ layout.menubar(section='workflows') }
       <h3 id="deleteWfMessage">${ _('Delete this workflow?') }</h3>
     </div>
     <div class="modal-footer">
-      <input type="submit" class="btn primary" value="${ _('Yes') }"/>
-      <a href="#" class="btn secondary" data-dismiss="modal">${ _('No') }</a>
+      <a href="#" class="btn" data-dismiss="modal">${ _('No') }</a>
+      <input type="submit" class="btn btn-danger" value="${ _('Yes') }"/>
     </div>
   </form>
 </div>
@@ -129,8 +129,8 @@ ${ layout.menubar(section='workflows') }
       ${ _('Hue is going to re-create the workspaces and re-install the examples...') }
     </div>
     <div class="modal-footer">
-      <input type="submit" class="btn primary" value="${ _('Yes') }"/>
-      <a href="#" class="btn secondary" data-dismiss="modal">${ _('No') }</a>
+      <a href="#" class="btn" data-dismiss="modal">${ _('No') }</a>
+      <input type="submit" class="btn btn-primary" value="${ _('Yes') }"/>
     </div>
   </form>
 </div>

+ 2 - 2
apps/oozie/src/oozie/templates/editor/submit_job_popup.mako

@@ -51,7 +51,7 @@
     </fieldset>
   </div>
   <div class="modal-footer">
-    <a href="#" class="btn secondary" data-dismiss="modal">${ _('Cancel') }</a>
-    <input id="submit-btn" type="submit" class="btn primary" value="${ _('Submit') }"/>
+    <a href="#" class="btn" data-dismiss="modal">${ _('Cancel') }</a>
+    <input id="submit-btn" type="submit" class="btn btn-primary" value="${ _('Submit') }"/>
   </div>
 </form>

+ 2 - 2
apps/useradmin/src/useradmin/templates/delete_group.mako

@@ -22,7 +22,7 @@ from django.utils.translation import ugettext as _
     <h3 id="deleteGroupMessage">${_("Are you sure you want to delete")} ${groupname}${_("?")}</h3>
 </div>
 <div class="modal-footer">
-    <input type="submit" class="btn primary" value="${_('Yes')}"/>
-    <a href="javascript:void(0);" class="btn secondary" data-dismiss="modal">${_('No')}</a>
+    <a href="javascript:void(0);" class="btn" data-dismiss="modal">${_('No')}</a>
+    <input type="submit" class="btn btn-danger" value="${_('Yes')}"/>
 </div>
 </form>

+ 2 - 2
apps/useradmin/src/useradmin/templates/delete_user.mako

@@ -22,7 +22,7 @@ from django.utils.translation import ugettext as _
         <h3 id="deleteUserMessage">${_("Are you sure you want to delete ")} ${username}${_("?")}</h3>
     </div>
     <div class="modal-footer">
-        <input type="submit" class="btn primary" value="${_('Yes')}"/>
-        <a href="#" class="btn secondary" data-dismiss="modal">${_('No')}</a>
+        <a href="#" class="btn" data-dismiss="modal">${_('No')}</a>
+        <input type="submit" class="btn btn-danger" value="${_('Yes')}"/>
     </div>
 </form>

+ 1 - 1
apps/useradmin/src/useradmin/templates/sync_ldap_users_groups.mako

@@ -47,6 +47,6 @@ from django.utils.translation import ugettext as _
   </div>
   <div class="modal-footer">
     <a href="#" class="btn" data-dismiss="modal">${_('Cancel')}</a>
-    <input type="submit" class="btn primary" value="${_('Sync')}"/>
+    <input type="submit" class="btn btn-primary" value="${_('Sync')}"/>
   </div>
 </form>

+ 2 - 2
desktop/core/src/desktop/templates/login.mako

@@ -67,9 +67,9 @@ from django.utils.translation import ugettext as _
 					</label>
 
 					%if first_login_ever==True:
-						<input type="submit" class="btn primary" value="${_('Sign up')}" />
+						<input type="submit" class="btn btn-primary" value="${_('Sign up')}" />
 					%else:
-						<input type="submit" class="btn primary" value="${_('Sign in')}" />
+						<input type="submit" class="btn btn-primary" value="${_('Sign in')}" />
 					%endif
 					<input type="hidden" name="next" value="${next}" />