Browse Source

HUE-5127 [jb] Link text labels to its radio button

Romain Rigaux 9 years ago
parent
commit
5c327f2

+ 2 - 1
Makefile.vars

@@ -36,7 +36,8 @@ ifneq ($(wildcard $(ROOT)/Makefile.buildvars),)
   include $(ROOT)/Makefile.buildvars
 endif
 
-PYTHON_H ?= $(shell ls /usr/include/python2.7/Python.h 2>/dev/null || ls /usr/include/python2.6/Python.h 2>/dev/null)
+#PYTHON_H ?= $(shell ls /usr/include/python2.7/Python.h 2>/dev/null || ls /usr/include/python2.6/Python.h 2>/dev/null)
+PYTHON_H ?= $(shell ls /usr/include/python2.6/Python.h 2>/dev/null)
 ifndef SKIP_PYTHONDEV_CHECK
   ifeq ($(PYTHON_H),)
     $(error "Error: must have python development packages for 2.6 or 2.7. Could not find Python.h. Please install python2.6-devel or python2.7-devel")

+ 5 - 5
apps/jobbrowser/src/jobbrowser/templates/apps.mako

@@ -129,14 +129,14 @@ ${ assist.assistPanel() }
             ${_('Username')} <input id="userFilter" type="text" class="input-medium search-query" placeholder="${_('Search for username')}" value="${ user_filter or '' }">
             &nbsp;&nbsp;${_('Text')} <input id="textFilter" type="text" class="input-xlarge search-query" placeholder="${_('Search for id, name, status...')}" value="${ text_filter or '' }">
 
-            <span>
-              <span><input class="btn btn-status" type="radio" name="interface" value="jobs" data-bind="checked: interface" />${ _('Jobs') }</span>
-              <span><input class="btn btn-status" type="radio" name="interface" value="batches" data-bind="checked: interface" />${ _('Batches') }</span>
-              <span><input class="btn btn-status" type="radio" name="interface" value="schedules" data-bind="checked: interface" />${ _('Schedules') }</span>
+            <span class="form-inline">
+              <input class="btn btn-status" type="radio" name="interface" value="jobs" data-bind="checked: interface" id="jobs"><label for="jobs">${ _('Jobs') }</label>
+              <input class="btn btn-status" type="radio" name="interface" value="batches" data-bind="checked: interface" id="batches"><label for="batches">${ _('Batches') }</label>
+              <input class="btn btn-status" type="radio" name="interface" value="schedules" data-bind="checked: interface" id="schedules"><label for="schedules">${ _('Schedules') }</label>
             </span>
 
             <span class="btn-group">
-              <span class="btn-group">
+              <class="btn-group">
                 <a class="btn btn-status btn-success" data-value="completed">${ _('Succeeded') }</a>
                 <a class="btn btn-status btn-warning" data-value="running">${ _('Running') }</a>
                 <a class="btn btn-status btn-danger disable-feedback" data-value="failed">${ _('Failed') }</a>

+ 1 - 1
apps/oozie/src/oozie/models2.py

@@ -863,7 +863,7 @@ class Node():
         self.data['properties']['subject'] = _("${wf:name()} execution successful")
 
       if mapping.get('send_result_path'):
-        if self.data['type'] == EndNode.TYPE:  
+        if self.data['type'] == EndNode.TYPE:
           self.data['properties']['body'] = 'View result file at %(send_result_browse_url)s' % mapping
 
     return django_mako.render_to_string(self.get_template_name(), data)

File diff suppressed because it is too large
+ 1 - 0
apps/oozie/src/oozie/models2_tests.py


+ 2 - 2
apps/oozie/src/oozie/views/dashboard.py

@@ -88,7 +88,7 @@ def _get_workflows(user):
         'value': workflow.uuid,
         'id': workflow.id
       } for workflow in [d.content_object for d in Document.objects.get_docs(user, Document2, extra='workflow2')]
-    ]  
+    ]
 
 
 def manage_oozie_jobs(request, job_id, action):
@@ -355,7 +355,7 @@ def list_oozie_workflow(request, job_id):
 
     if hue_coord and hue_coord.workflow: Job.objects.can_read_or_exception(request, hue_coord.workflow.id)
     if hue_workflow: Job.objects.can_read_or_exception(request, hue_workflow.id)
-    
+
     if hue_workflow:
       workflow_graph = hue_workflow.gen_status_graph(oozie_workflow)
       full_node_list = hue_workflow.node_list

+ 3 - 3
apps/search/src/search/templates/search.mako

@@ -224,7 +224,7 @@ ${ commonheader(_('Search'), "search", user, request, "80px") | n,unicode }
          <a data-bind="style: { cursor: $root.availableDraggableChart() ? 'move' : 'default' }">
                        <i class="hcha hcha-bar-chart"></i>
          </a>
-    </div>    
+    </div>
     <div data-bind="visible: ! $root.isLatest(),
                     css: { 'draggable-widget': true, 'disabled': !availableDraggableNumbers() },
                     draggable: {data: draggableLine(), isEnabled: availableDraggableNumbers,
@@ -289,7 +289,7 @@ ${ commonheader(_('Search'), "search", user, request, "80px") | n,unicode }
          <a data-bind="style: { cursor: $root.availableDraggableMap() ? 'move' : 'default' }">
                        <i class="hcha hcha-map-chart"></i>
          </a>
-   </div>   
+   </div>
       </%def>
 </%dashboard:layout_toolbar>
 
@@ -1337,7 +1337,7 @@ ${ dashboard.layout_skeleton() }
   <!-- ko if: $root.getFacetFromQuery(id()).has_data() -->
   <div class="row-fluid" data-bind="with: $root.getFacetFromQuery(id())">
     <div data-bind="with: $root.collection.getFacetById($parent.id())">
-      
+
       <span data-bind="template: { name: 'facet-toggle2' }"></span>
 
       <div class="pull-right" style="margin-top: 40px">

+ 1 - 1
desktop/libs/liboozie/src/liboozie/submission2.py

@@ -214,7 +214,7 @@ WITH SERDEPROPERTIES (
    "separatorChar" = "\t",
    "quoteChar"     = "'",
    "escapeChar"    = "\\"
-)  
+)
 STORED AS TEXTFILE %s""" % (self.properties.get('send_result_path'), statements)
 
           if statements is not None:

Some files were not shown because too many files changed in this diff