Browse Source

No Ticket. JFrameGallery index now shows _ as spaces. Renaming a few JFrame Gallery files and removing a duplicate.

Aaron Newton 15 years ago
parent
commit
37ff762902

+ 0 - 72
apps/jframegallery/src/jframegallery/templates/fit.text.(table).mako

@@ -1,72 +0,0 @@
-## 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.
-
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
-<html>
-	<head>
-		<title>FitText (table)</title>
-	</head>
-	<body>
-	<h1 class="ccs-hidden">FitText (table)</h1>
-	
-	<table cellpadding="0" cellspacing="0">
-		<thead>
-			<tr>
-				<th>
-							ID
-				</th>
-				<th>
-							TimeZone
-				</th>
-				<th>
-							Name
-				</th>
-				<th>
-							GEO Latitude
-				</th>
-				<th>
-							GEO Longitude
-				</th>
-			</tr>
-		</thead>
-		<tbody>
-			% for i in range(10000):
-				<tr>
-					<td>
-						${i}
-					</td>
-					<td>
-						New York City
-					</td>
-					<td>
-						America/New_York
-						America/New_York
-						America/New_York
-						America/New_York
-					</td>
-					<td>
-						40.7255
-					</td>
-					<td>
-						-73.9983
-					</td>
-				</tr>
-			% endfor
-		</tbody>
-	</table>
-	
-	</body>
-</html>

+ 0 - 0
apps/jframegallery/src/jframegallery/templates/HtmlTable.HtmlTableCheckSelected.html → apps/jframegallery/src/jframegallery/templates/html-table.check.selected.html


+ 0 - 0
apps/jframegallery/src/jframegallery/templates/pstree.mako → apps/jframegallery/src/jframegallery/templates/html-table.treeview.ajax.mako


+ 1 - 1
apps/jframegallery/src/jframegallery/urls.py

@@ -31,6 +31,6 @@ urlpatterns = patterns('jframegallery',
   url(r'^error_message_exception.*$', 'views.error_message_exception'),
   url(r'^error_popup_exception.*$', 'views.error_popup_exception'),
   url(r'^forms_with_dependencies.*$', 'views.forms_with_dependencies'),
-  url(r'^pstree.*$', 'views.pstree'),
+  url(r'^html-table.treeview.ajax.*$', 'views.pstree'),
   url(r'^(?P<path>.*)$', 'views.show')
 )

+ 2 - 2
apps/jframegallery/src/jframegallery/views.py

@@ -36,7 +36,7 @@ def index(request):
       name = filename.replace('.html', '').replace('.mako', '')
       files.append(dict(
         filename=filename,
-        name= name.capitalize().replace('.', ' '),
+        name= name.capitalize().replace('.', ' ').replace('_', ' '),
         id=name.replace(' ', '-').replace('.', '-')
       ))
   #render the index, passing along the file list
@@ -196,7 +196,7 @@ def pstree(request):
     return request.path + "?" + "&".join(urllib.urlencode([("paths", x)]) for x in paths)
 
   paths = request.GET.getlist("paths")
-  return render("pstree.mako", request, dict(
+  return render("html-table.treeview.ajax.mako", request, dict(
     tops=tops, show_all=request.GET.get("show_all"), 
     open_paths=paths, request_path=request.path,
     add=add, remove=remove))