dpillot 2005/09/30 18:14:27 CEST
Modified files:
core/src/webapp/jsp/jahia/engines/importexport contentpick.jsp
Log:
raw integration with css and added usage number on objects searched
Revision Changes Path
1.14 +32 -8
jahia/core/src/webapp/jsp/jahia/engines/importexport/contentpick.jsp
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/core/src/webapp/jsp/jahia/engines/importexport/contentpick.jsp.diff?r1=1.13&r2=1.14&f=h
Index: contentpick.jsp
===================================================================
RCS file:
/home/cvs/repository/jahia/core/src/webapp/jsp/jahia/engines/importexport/contentpick.jsp,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- contentpick.jsp 29 Sep 2005 16:41:33 -0000 1.13
+++ contentpick.jsp 30 Sep 2005 16:14:26 -0000 1.14
@@ -5,20 +5,24 @@
<%@ page import="java.util.Enumeration"%>
<%@ page import="org.jahia.services.sites.JahiaSite"%>
<%@ page import="java.util.Date"%>
-<%@ page import="org.jahia.engines.importexport.ManageContentPicker"%>
+
<%@ page import="java.util.Vector"%>
+<%@ page import="org.jahia.services.containers.ContentContainer"%>
<%@ taglib uri="/WEB-INF/etc/taglibs/pager-taglib" prefix="pg" %>
<%
HashMap engineMap = (HashMap)
request.getAttribute("org.jahia.engines.EngineHashMap");
JahiaSearchResult sr = (JahiaSearchResult)
engineMap.get("searchResults");
-
+ String theScreen = (String) engineMap.get("screen");
//used to order the results
String orderBy=(String)engineMap.get("orderby");
%>
-<%=orderBy%>
+<div class="menuwrapper">
+<div class="content">
+<div id="editor">
+sort by <%=orderBy%><br/>
<script language="javascript">
function orderby(param){
@@ -65,7 +69,7 @@
<style type="text/css">
.switchcontent {
display: none;
- margin: 0px;
+ margin: 3px;
width: 100%;
font-size: 12px;
font-family: Arial, sans-serif;
@@ -75,12 +79,23 @@
background-color: #eee;
}
+ .switchcontent1 {
+ display: block;
+ margin: 3px;
+ width: 100%;
+ font-size: 12px;
+ font-family: Arial, sans-serif;
+ text-align: justify;
+ margin-bottom: 4px;
+ padding: 2px 2px;
+ background-color: #eee;
+ }
</style>
<input type="hidden" name="orderby" value="score"/>
<table border=0><tr><td>
-<div id="sc1" class="switchcontentx">
+<div id="sc1" class="switchcontent1">
<a href="javascript:expandcontent('sc2')"><img
src="/jahia/jsp/jahia/engines/images/adding.png" width="16" height="16"
border="0"></a>
@@ -124,7 +139,7 @@
-<TABLE cellSpacing=0 cellPadding=3 width="100%" border=1>
+<TABLE cellSpacing=0 cellPadding=3 width="100%" border=0>
<TBODY>
<%
@@ -142,7 +157,7 @@
<%
if (totalHits != 0) {
%>
- <table border="1" cellspacing="0"
cellpadding="4" width="100%">
+ <table border="0" cellspacing="0"
cellpadding="4" width="100%">
<tr>
<th class="text">teaser</th>
<th class="text"><a
href="javascript:orderby('creator');">creator</a></th>
@@ -165,7 +180,7 @@
<td class="text"><a
href="<%=thisHit.getURL()%>"><b><%=thisHit.getTeaser()%></b></a></td>
<td
class="text"><%=thisHit.getParsedObject().getValue("creator")%></td>
<td
class="text"><%=thisHit.getParsedObject().getValue("lastcontributor")%></td>
- <td class="text">(container
<%=thisHit.getId()%>
+ <td class="text">(container
<%=thisHit.getId()%>
usage[<%=ContentContainer.getContainer(Integer.parseInt(thisHit.getId())).getPickerObjects().size()%>]
in
<%=ServicesRegistry.getInstance().getJahiaSitesService().getSite(thisHit.getPage().getJahiaID()).getSiteKey()%>
)</td>
<!--td class="text">score :
<%=thisHit.getScore()%></td-->
@@ -215,3 +230,12 @@
%>
</TBODY>
</TABLE>
+</div>
+</div>
+
+<div class="menu">
+ <%@ include file="../tools.inc" %>
+</div>
+
+<div class="clearing"> </div>
+</div>
\ No newline at end of file
