Selaa lähdekoodia

[core] Update jQuery to 1.8 and Bootstrap to 2.1

Upgraded jQuery to 1.8.1 and Bootstrap to 2.1.1
Removed unused common_header and common_footer for iframes
Enrico Berti 13 vuotta sitten
vanhempi
commit
da6a62d19c
27 muutettua tiedostoa jossa 33 lisäystä ja 138 poistoa
  1. 0 11
      apps/beeswax/src/beeswax/templates/choose_file.mako
  2. 2 2
      apps/beeswax/src/beeswax/templates/configuration.mako
  3. 0 7
      apps/beeswax/src/beeswax/templates/create_table_manually.mako
  4. 1 1
      apps/beeswax/src/beeswax/templates/my_queries.mako
  5. 2 2
      apps/jobbrowser/src/jobbrowser/templates/job.mako
  6. 5 12
      apps/jobsub/src/jobsub/templates/edit_design.mako
  7. 1 1
      apps/jobsub/src/jobsub/templates/list_designs.mako
  8. 1 1
      apps/jobsub/src/jobsub/templates/list_history.mako
  9. 1 1
      apps/oozie/src/oozie/templates/dashboard/list_oozie_coordinators.mako
  10. 1 1
      apps/oozie/src/oozie/templates/dashboard/list_oozie_workflows.mako
  11. 0 7
      apps/oozie/src/oozie/templates/editor/edit_workflow_action.mako
  12. 4 4
      apps/oozie/src/oozie/templates/editor/list_coordinators.mako
  13. 1 1
      apps/oozie/src/oozie/templates/editor/list_history.mako
  14. 1 2
      apps/oozie/src/oozie/templates/editor/list_workflows.mako
  15. 1 1
      apps/useradmin/src/useradmin/templates/list_groups.mako
  16. 1 1
      apps/useradmin/src/useradmin/templates/list_permissions.mako
  17. 1 1
      apps/useradmin/src/useradmin/templates/list_users.mako
  18. 0 20
      desktop/core/src/desktop/templates/common_footer_iframe.html
  19. 1 1
      desktop/core/src/desktop/templates/common_header.mako
  20. 0 48
      desktop/core/src/desktop/templates/common_header_iframe.html
  21. 0 11
      desktop/core/src/desktop/views.py
  22. 7 0
      desktop/core/static/css/hue2.css
  23. 1 1
      desktop/core/static/ext/css/bootstrap.min.css
  24. BIN
      desktop/core/static/ext/img/glyphicons-halflings.png
  25. 0 0
      desktop/core/static/ext/js/bootstrap.min.js
  26. 0 1
      desktop/core/static/ext/js/jquery/jquery-1.7.1.min.js
  27. 1 0
      desktop/core/static/ext/js/jquery/jquery-1.8.1.min.js

+ 0 - 11
apps/beeswax/src/beeswax/templates/choose_file.mako

@@ -126,17 +126,6 @@ ${layout.menubar(section='tables')}
         margin-top: 10px;
     }
 
-    .pathChooser {
-        border-radius: 3px 0 0 3px;
-        border-right: 0;
-        margin-right: 0;
-    }
-
-    .fileChooserBtn {
-        border-radius: 0 3px 3px 0;
-        margin-left: 0;
-    }
-
     #fileWillBeMoved {
         margin-top: 10px;
     }

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

@@ -32,9 +32,9 @@ ${layout.menubar(section='configuration')}
 		    <button type="submit" class="btn primary">${_('Look')}</button>
 		   </span>
 		   <span class="pull-right">
-              ${_('Filter:')} <input id="filterInput" class="input-xlarge search-query" placeholder="${_('Search for key, value, etc...')}">
+              ${_('Filter:')} <input type="text" id="filterInput" class="input-xlarge search-query" placeholder="${_('Search for key, value, etc...')}">
 		      <a href="#" id="clearFilterBtn" class="btn">${_('Clear')}</a>
-		   <span>
+		   </span>
 		</form>
 	</div>
 	<table class="table table-striped table-condensed datatables">

+ 0 - 7
apps/beeswax/src/beeswax/templates/create_table_manually.mako

@@ -399,13 +399,6 @@ ${layout.menubar(section='tables')}
 </div>
 
 <style>
-    .pathChooser {
-        border-radius: 3px 0 0 3px;
-        border-right:0;
-    }
-    .fileChooserBtn {
-        border-radius: 0 3px 3px 0;
-    }
     #filechooser {
         min-height:100px;
         overflow-y:scroll;

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

@@ -38,7 +38,7 @@ ${layout.menubar(section='my queries')}
         </div>
 
         <form class="form-search">
-            ${_('Filter:')} <input placeholder="${_('Search for name, description, etc...')}" class="input-xlarge search-query" id="filterInput">
+            ${_('Filter:')} <input type="text" placeholder="${_('Search for name, description, etc...')}" class="input-xlarge search-query" id="filterInput">
         </form>
     </div>
 

+ 2 - 2
apps/jobbrowser/src/jobbrowser/templates/job.mako

@@ -173,7 +173,7 @@ ${commonheader(_('Job: %(jobId)s - Job Browser') % dict(jobId=job.jobId), "jobbr
                 <div id="metadata" class="tab-pane">
                     <div class="well hueWell">
                         <form class="form-search">
-                            ${_('Filter: ')}<input id="metadataFilter" class="input-xlarge search-query" placeholder="${_('Text Filter')}">
+                            ${_('Filter: ')}<input type="text" id="metadataFilter" class="input-xlarge search-query" placeholder="${_('Text Filter')}">
                         </form>
                     </div>
                     <table id="metadataTable" class="table table-striped table-condensed">
@@ -311,4 +311,4 @@ ${commonheader(_('Job: %(jobId)s - Job Browser') % dict(jobId=job.jobId), "jobbr
 </script>
 
 
-${commonfooter(messages)}
+${commonfooter(messages)}

+ 5 - 12
apps/jobsub/src/jobsub/templates/edit_design.mako

@@ -39,7 +39,7 @@ ${layout.menubar(section='designs')}
     <div class="control-group ${group_class}">
       <label class="control-label">${field.label | n}</label>
       <div class="controls">
-        <input name="${field.html_name | n}"
+        <input type="text" name="${field.html_name | n}"
             class="span5 ${field.field.widget.attrs.get('class', '')}"
             value="${extract_field_data(field) or ''}" />
         % if len(field.errors):
@@ -86,8 +86,8 @@ ${layout.menubar(section='designs')}
                   </thead>
                   <tbody data-bind="foreach: properties">
                     <tr>
-                      <td><input class="span3 required propKey" data-bind="value: name, uniqueName: false" /></td>
-                      <td><input class="span4 required pathChooserKo" data-bind="fileChooser: $data, value: value, uniqueName: false" /></td>
+                      <td><input type="text" class="span3 required propKey" data-bind="value: name, uniqueName: false" /></td>
+                      <td><input type="text" class="span4 required pathChooserKo" data-bind="fileChooser: $data, value: value, uniqueName: false" /></td>
                       <td><a class="btn btn-small" href="#" data-bind="click: $root.removeProp">${_('Delete')}</a></td>
                     </tr>
                   </tbody>
@@ -111,7 +111,7 @@ ${layout.menubar(section='designs')}
                 <table class="table-condensed designTable" data-bind="visible: files().length > 0">
                   <tbody data-bind="foreach: files">
                     <tr>
-                      <td><input class="input span5 required pathChooserKo"
+                      <td><input type="text" class="input span5 required pathChooserKo"
                                 data-bind="fileChooser: $data, value: name, uniqueName: false" /></td>
                       <td><a class="btn" href="#" data-bind="click: $root.removeFile">${_('Delete')}</a></td>
                     </tr>
@@ -134,7 +134,7 @@ ${layout.menubar(section='designs')}
                 <table class="table-condensed designTable" data-bind="visible: archives().length > 0">
                   <tbody data-bind="foreach: archives">
                     <tr>
-                      <td><input class="input span5 required pathChooserKo"
+                      <td><input type="text" class="input span5 required pathChooserKo"
                                 data-bind="fileChooser: $data, value: name, uniqueName: false" /></td>
                       <td><a class="btn" href="#" data-bind="click: $root.removeArchive">${_('Delete')}</a></td>
                     </tr>
@@ -176,13 +176,6 @@ ${layout.menubar(section='designs')}
 
 
 <style>
-    .pathChooser, .pathChooserKo {
-        border-radius: 3px 0 0 3px;
-        border-right:0;
-    }
-    .fileChooserBtn {
-        border-radius: 0 3px 3px 0;
-    }
     #fileChooserModal {
         padding:14px;
         height:270px;

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

@@ -43,7 +43,7 @@ ${layout.menubar(section='designs')}
         </div>
 
         <form class="form-search">
-            ${_('Filter: ')}<input id="filterInput" class="input-xlarge search-query" placeholder="${_('Search for username, name, etc...')}">
+            ${_('Filter: ')}<input type="text" id="filterInput" class="input-xlarge search-query" placeholder="${_('Search for username, name, etc...')}">
         </form>
     </div>
 

+ 1 - 1
apps/jobsub/src/jobsub/templates/list_history.mako

@@ -32,7 +32,7 @@ ${layout.menubar(section='history')}
     <h1>${_('Job Submission History')}</h1>
     <div class="well hueWell">
         <form class="form-search">
-            ${_('Filter: ')}<input id="filterInput" class="input-xlarge search-query" placeholder="${_('Search for username, name, etc...')}">
+            ${_('Filter: ')}<input type="text" id="filterInput" class="input-xlarge search-query" placeholder="${_('Search for username, name, etc...')}">
         </form>
     </div>
 

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

@@ -31,7 +31,7 @@ ${layout.menubar(section='dashboard')}
 
   <div class="well hueWell">
     <form>
-      ${ _('Filter:') } <input id="filterInput" class="input-xlarge search-query" placeholder="${ _('Search for username, name, etc...') }">
+      ${ _('Filter:') } <input type="text" id="filterInput" class="input-xlarge search-query" placeholder="Search for username, name, etc...">
 
       <span class="pull-right">
         <span style="padding-right:10px;float:left;margin-top:3px">

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

@@ -32,7 +32,7 @@ ${ layout.menubar(section='dashboard') }
 
   <div class="well hueWell">
     <form>
-      ${ _('Filter:') } <input id="filterInput" class="input-xlarge search-query" placeholder="${ _('Search for username, name, etc...') }">
+      ${ _('Filter:') } <input type="text" id="filterInput" class="input-xlarge search-query" placeholder="${ _('Search for username, name, etc...') }">
 
       <span class="pull-right">
         <span style="padding-right:10px;float:left;margin-top:3px">

+ 0 - 7
apps/oozie/src/oozie/templates/editor/edit_workflow_action.mako

@@ -262,13 +262,6 @@ ${ layout.menubar(section='workflows') }
   td.pathChooserKo {
     min-width: 404px;
   }
-  .pathChooser, .pathChooserKo {
-    border-radius: 3px 0 0 3px;
-    border-right:0;
-  }
-  .fileChooserBtn {
-    border-radius: 0 3px 3px 0;
-  }
 
   #fileChooserModal {
     padding:14px;

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

@@ -35,13 +35,13 @@ ${ layout.menubar(section='coordinators') }
     </div>
 
     <div class="row-fluid">
-      <div class="span3">
+      <div class="span4">
         <form>
-          ${ _('Filter:') }
-          <input id="filterInput" class="input-xlarge search-query" placeholder="${ _('Search for username, name, etc...') }">
+            ${ _('Filter:') }
+            <input id="filterInput" class="input-xlarge search-query" type="text" placeholder="${ _('Search for username, name, etc...') }">
         </form>
       </div>
-      <div class="span3">
+      <div class="span4">
         <button class="btn action-buttons" id="submit-btn" disabled="disabled"><i class="icon-play"></i> ${ _('Submit') }</button>
       &nbsp;&nbsp;&nbsp;&nbsp;
       <button class="btn action-buttons" id="clone-btn" disabled="disabled"><i class="icon-retweet"></i> ${ _('Copy') }</button>

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

@@ -31,7 +31,7 @@ ${ layout.menubar(section='history') }
   <h1>${ _('Submission History') }</h1>
   <div class="well hueWell">
     <form class="form-search">
-      ${ _('Filter:') } <input id="filterInput" class="input-xlarge search-query" placeholder="${ _('Search for username, name, etc...') }">
+      ${ _('Filter:') } <input type="text" id="filterInput" class="input-xlarge search-query" placeholder="${ _('Search for username, name, etc...') }">
     </form>
   </div>
 

+ 1 - 2
apps/oozie/src/oozie/templates/editor/list_workflows.mako

@@ -40,7 +40,7 @@ ${ layout.menubar(section='workflows') }
     <div class="row-fluid">
       <div class="span4">
         <form>
-          ${ _('Filter:') } <input id="filterInput" class="input-xlarge search-query" placeholder="${ _('Search for username, name, etc...') }">
+          ${ _('Filter:') } <input type="text" id="filterInput" class="input-xlarge search-query" placeholder="${ _('Search for username, name, etc...') }">
         </form>
       </div>
       <div class="span4">
@@ -50,7 +50,6 @@ ${ layout.menubar(section='workflows') }
         <button class="btn action-buttons" id="clone-btn" disabled="disabled"><i class="icon-retweet"></i> ${ _('Copy') }</button>
         <button class="btn action-buttons" id="delete-btn" disabled="disabled"><i class="icon-remove"></i> ${ _('Delete') }</button>
       </div>
-      <div class="span4"></div>
     </div>
   </div>
 

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

@@ -34,7 +34,7 @@ ${layout.menubar(section='groups', _=_)}
             %endif
         </div>
         <form class="form-search">
-            ${_('Filter: ')}<input id="filterInput" class="input-xxlarge search-query" placeholder="${_('Search for group name, members, etc...')}">
+            ${_('Filter: ')}<input type="text" id="filterInput" class="input-xxlarge search-query" placeholder="${_('Search for group name, members, etc...')}">
         </form>
     </div>
     <table class="table table-striped datatables">

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

@@ -29,7 +29,7 @@ ${layout.menubar(section='permissions', _=_)}
     <h1>${_('Hue Permissions')}</h1>
     <div class="well hueWell">
         <form class="form-search">
-                ${_('Filter: ')}<input id="filterInput" class="input-xxlarge search-query" placeholder="${_('Search for application name, description, etc...')}">
+                ${_('Filter: ')}<input type="text" id="filterInput" class="input-xxlarge search-query" placeholder="${_('Search for application name, description, etc...')}">
         </form>
     </div>
     <table class="table table-striped datatables">

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

@@ -35,7 +35,7 @@ ${layout.menubar(section='users', _=_)}
             %endif
         </div>
         <form class="form-search">
-            ${_('Filter: ')}<input id="filterInput" class="input-xxlarge search-query" placeholder="${_('Search for username, name, e-mail, etc...')}">
+            ${_('Filter: ')}<input type="text" id="filterInput" class="input-xxlarge search-query" placeholder="${_('Search for username, name, e-mail, etc...')}">
         </form>
     </div>
     <table class="table table-striped datatables">

+ 0 - 20
desktop/core/src/desktop/templates/common_footer_iframe.html

@@ -1,20 +0,0 @@
-{% comment %}
-Licensed to Cloudera, Inc. under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  Cloudera, Inc. licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License.  You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-{% endcomment %}
-
-	</body>
-</html>

+ 1 - 1
desktop/core/src/desktop/templates/common_header.mako

@@ -57,7 +57,7 @@ from django.utils.translation import ugettext as _
     % endif
   </style>
 
-  <script src="/static/ext/js/jquery/jquery-1.7.1.min.js"></script>
+  <script src="/static/ext/js/jquery/jquery-1.8.1.min.js"></script>
   <script src="/static/js/Source/jHue/jquery.showusername.js"></script>
   <script src="/static/js/Source/jHue/jquery.filechooser.js"></script>
   <script src="/static/js/Source/jHue/jquery.selector.js"></script>

+ 0 - 48
desktop/core/src/desktop/templates/common_header_iframe.html

@@ -1,48 +0,0 @@
-{% comment %}
-Licensed to Cloudera, Inc. under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  Cloudera, Inc. licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License.  You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-{% endcomment %}
-<!DOCTYPE html>
-<html lang="en">
-<head>
-	<meta charset="utf-8">
-	<title>{{title}}</title>
-	<meta name="viewport" content="width=device-width, initial-scale=1.0">
-	<meta name="description" content="">
-	<meta name="author" content="">
-
-	<link href="/static/ext/css/bootstrap.min.css" rel="stylesheet">
-	<link href="/static/css/hue2.css" rel="stylesheet">
-	<link href="/static/ext/css/fileuploader.css" rel="stylesheet">
-
-	<!-- Le HTML5 shim, for IE6-8 support of HTML5 elements -->
-	<!--[if lt IE 9]>
-	<script src="http://html5shim.googlecode.com/svn/trunk/html5.js"></script>
-	<![endif]-->
-
-
-	<script src="/static/ext/js/jquery/jquery-1.7.1.min.js"></script>
-	<script src="/static/js/Source/jHue/jquery.showusername.js"></script>
-	<script src="/static/js/Source/jHue/jquery.filechooser.js"></script>
-	<script src="/static/js/Source/jHue/jquery.rowselector.js"></script>
-	<script src="/static/js/Source/jHue/jquery.selector.js"></script>
-	<script src="/static/js/Source/jHue/jquery.alert.js"></script>
-	<script src="/static/ext/js/jquery/plugins/jquery.simpleplaceholder.js"></script>
-	<script src="/static/ext/js/jquery/plugins/jquery.dataTables.1.8.2.min.js"></script>
-	<script src="/static/ext/js/bootstrap.min.js"></script>
-	<script src="/static/ext/js/fileuploader.js"></script>
-</head>
-<body>

+ 0 - 11
desktop/core/src/desktop/views.py

@@ -286,17 +286,6 @@ def commonfooter(messages=None):
     messages = {}
   return render_to_string("common_footer.html", {'messages': messages})
 
-def commonheader_iframe():
-  """
-  Returns the rendered common header for iframes
-  """
-  return render_to_string("common_header_iframe.html")
-
-def commonfooter_iframe():
-  """
-  Returns the rendered common footer for iframes
-  """
-  return render_to_string("common_footer_iframe.html")
 
 # If the app's conf.py has a config_validator() method, call it.
 CONFIG_VALIDATOR = 'config_validator'

+ 7 - 0
desktop/core/static/css/hue2.css

@@ -844,6 +844,13 @@ div.box {
     border-top: 1px dashed #EEEEEE;
 }
 
+.pathChooser, .pathChooserKo {
+    border-radius: 3px 0 0 3px!important;
+    border-right:0!important;
+}
+.fileChooserBtn {
+    border-radius: 0 3px 3px 0!important;
+}
 
 /*
  * jHueSelector

Tiedoston diff-näkymää rajattu, sillä se on liian suuri
+ 1 - 1
desktop/core/static/ext/css/bootstrap.min.css


BIN
desktop/core/static/ext/img/glyphicons-halflings.png


Tiedoston diff-näkymää rajattu, sillä se on liian suuri
+ 0 - 0
desktop/core/static/ext/js/bootstrap.min.js


Tiedoston diff-näkymää rajattu, sillä se on liian suuri
+ 0 - 1
desktop/core/static/ext/js/jquery/jquery-1.7.1.min.js


Tiedoston diff-näkymää rajattu, sillä se on liian suuri
+ 1 - 0
desktop/core/static/ext/js/jquery/jquery-1.8.1.min.js


Kaikkia tiedostoja ei voida näyttää, sillä liian monta tiedostoa muuttui tässä diffissä