Explorar o código

Improved 'well' spacing and remove Clear button from filter

Enrico Berti %!s(int64=13) %!d(string=hai) anos
pai
achega
f1bcb74f59

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

@@ -39,14 +39,13 @@ from django.utils.encoding import smart_str
 	        margin: 0;
 	    }
 	</style>
-	<div class="well">
+	<div class="well hueWell">
 		<p class="pull-right">
 			<a href="#" class="btn upload-link">Upload files</a>
 			<a href="#" class="btn create-directory-link">New directory</a>
 		</p>
 		<form class="form-search">
 			Filter: <input id="filterInput" class="input-xlarge search-query" placeholder="Search for file name">
-		    <a href="#" id="clearFilterBtn" class="btn">Clear</a>
 		</form>
 	</div>
 
@@ -341,11 +340,6 @@ from django.utils.encoding import smart_str
             oTable.fnFilter($(this).val(), 0 /* Column Idx */);
             $(".contextEnabler").jHueContextMenu();
         });
-		$("#clearFilterBtn").click(function(){
-	        $("#filterInput").val("");
-	        oTable.fnFilter("", 0);
-	    });
-
 
         //delete handlers
         $(".delete").live("click", function(e){

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

@@ -30,7 +30,7 @@ ${layout.menubar(section='designs')}
 
 <div class="container-fluid">
     <h1>Job Designs</h1>
-	<div class="well">
+	<div class="well hueWell">
 			<div class="btn-group pull-right">
 				<a href="${ url('jobsub.views.new_design', action_type='mapreduce') }" class="btn">Create Mapreduce Design</a>
             	<a href="${ url('jobsub.views.new_design', action_type='streaming') }" class="btn">Create Streaming Design</a>
@@ -42,7 +42,6 @@ ${layout.menubar(section='designs')}
 
 		<form class="form-search">
 			Filter: <input id="filterInput" class="input-xlarge search-query" placeholder="Search for username, name, etc...">
-		    <a href="#" id="clearFilterBtn" class="btn">Clear</a>
 		</form>
 	</div>
 
@@ -151,13 +150,6 @@ ${layout.menubar(section='designs')}
             $("#deleteWf").modal("hide");
         });
 
-        $(".installSamplesLink").click(function(){
-            $("#installSamples").modal("show");
-        });
-        $("#installSamples .hideModal").click(function(){
-            $("#installSamples").modal("hide");
-        });
-
         $(".submitConfirmation").click(function(){
             var _this = $(this);
             var _action = _this.attr("data-submit-url");
@@ -211,10 +203,6 @@ ${layout.menubar(section='designs')}
         $("#filterInput").keyup(function() {
             oTable.fnFilter($(this).val());
         });
-		$("#clearFilterBtn").click(function(){
-	        $("#filterInput").val("");
-	        oTable.fnFilter("");
-	    });
 
 		$("#installSamplesLink").click(function(){
             $("#installSamples").modal("show");

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

@@ -31,10 +31,9 @@ ${layout.menubar(section='history')}
 
 <div class="container-fluid">
     <h1>Job Submission History</h1>
-    <div class="well">
+    <div class="well hueWell">
         <form class="form-search">
 			Filter: <input id="filterInput" class="input-xlarge search-query" placeholder="Search for username, name, etc...">
-		    <a href="#" id="clearFilterBtn" class="btn">Clear</a>
 		</form>
     </div>
 
@@ -87,10 +86,6 @@ ${layout.menubar(section='history')}
             oTable.fnFilter($(this).val());
         });
 
-		$("#clearFilterBtn").click(function(){
-	        $("#filterInput").val("");
-	        oTable.fnFilter("");
-	    });
     });
 </script>
 

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

@@ -27,7 +27,7 @@ ${layout.menubar(section='groups')}
 
 <div class="container-fluid">
 	<h1>Hue Groups</h1>
-	<div class="well">
+	<div class="well hueWell">
 		<p class="pull-right">
 			%if user.is_superuser == True:
 			<a id="addGroupBtn" href="#" class="btn">Add group</a>
@@ -35,7 +35,6 @@ ${layout.menubar(section='groups')}
 		</p>
 		<form class="form-search">
 			Filter: <input id="filterInput" class="input-xlarge search-query" placeholder="Search for group name, members, etc...">
-		    <a href="#" id="clearFilterBtn" class="btn">Clear</a>
 		</form>
 	</div>
       <table class="table table-striped datatables">
@@ -152,13 +151,6 @@ ${layout.menubar(section='groups')}
 
 		    });
 
-		    $("#clearFilterBtn").click(function(){
-		        $("#filterInput").val("");
-		        $.each($(".groupRow"), function(index, value) {
-		            $(value).show(250);
-		        });
-		    });
-
 			$("#addGroupBtn").click(function(){
 				$("#addGroupFrame").css("height","400px").attr("src","${url('useradmin.views.edit_group')}");
 				$("#addGroup").modal("show");

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

@@ -28,10 +28,9 @@ ${layout.menubar(section='permissions')}
 
 <div class="container-fluid">
 	<h1>Hue Permissions</h1>
-	<div class="well">
+	<div class="well hueWell">
 		<form class="form-search">
 			Filter: <input id="filterInput" class="input-xlarge search-query" placeholder="Search for application name, description, etc...">
-		    <a href="#" id="clearFilterBtn" class="btn">Clear</a>
 		</form>
 	</div>
       <table class="table table-striped datatables">
@@ -99,13 +98,6 @@ ${layout.menubar(section='permissions')}
 
 		    });
 
-		    $("#clearFilterBtn").click(function(){
-		        $("#filterInput").val("");
-		        $.each($(".permissionRow"), function(index, value) {
-		            $(value).show();
-		        });
-		    });
-
 			$(".editPermissionBtn").click(function(){
 				$("#editPermission").find(".applicationName").text($(this).data("name"));
 				$("#editPermissionFrame").css("height","260px").attr("src", $(this).data("url"));

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

@@ -27,7 +27,7 @@ ${layout.menubar(section='users')}
 
 <div class="container-fluid">
 	<h1>Hue Users</h1>
-	<div class="well">
+	<div class="well hueWell">
 		<p class="pull-right">
 			%if user.is_superuser == True:
 			<a id="addUserBtn" href="#" class="btn">Add user</a>
@@ -35,7 +35,6 @@ ${layout.menubar(section='users')}
 		</p>
 		<form class="form-search">
 			Filter: <input id="filterInput" class="input-xlarge search-query" placeholder="Search for username, name, e-mail, etc...">
-		    <a href="#" id="clearFilterBtn" class="btn">Clear</a>
 		</form>
 	</div>
 	<table class="table table-striped datatables">
@@ -158,13 +157,6 @@ ${layout.menubar(section='users')}
 
 		    });
 
-		    $("#clearFilterBtn").click(function(){
-		        $("#filterInput").val("");
-		        $.each($(".userRow"), function(index, value) {
-		            $(value).show(250);
-		        });
-		    });
-
 			$("#addUserBtn").click(function(){
 				$("#addUserFrame").css("height","300px").attr("src","${ url('useradmin.views.edit_user') }");
 				$("#addUser").modal("show");

+ 4 - 0
desktop/core/static/css/jhue.css

@@ -385,6 +385,10 @@ ul.errorlist li {
     display:none;
 }
 
+.hueWell {
+    padding-bottom:0;
+}
+
 /*********************************************************
  * From: http://datatables.net/blog/Twitter_Bootstrap
  */