Author: ssmiweve
Date: 2008-03-26 21:45:46 +0100 (Wed, 26 Mar 2008)
New Revision: 6276
Modified:
trunk/generic.sesam/sesam.com/war/src/main/conf/messages_en.properties
trunk/generic.sesam/sesam.com/war/src/main/css/tab/default-sesam-com.css
trunk/generic.sesam/sesam.com/war/src/main/webapp/WEB-INF/classes/fragments/layout/sesam.com/footer.jsp
trunk/generic.sesam/sesam.com/war/src/main/webapp/WEB-INF/classes/pages/sesam.com/index.jsp
trunk/skin-archetype/
trunk/war/src/main/java/no/sesat/search/view/taglib/TextMessageTag.java
Log:
SEARCH-4302 - Building Sesam.com tutorial
Modified: trunk/generic.sesam/sesam.com/war/src/main/conf/messages_en.properties
===================================================================
--- trunk/generic.sesam/sesam.com/war/src/main/conf/messages_en.properties
2008-03-26 17:28:34 UTC (rev 6275)
+++ trunk/generic.sesam/sesam.com/war/src/main/conf/messages_en.properties
2008-03-26 20:45:46 UTC (rev 6276)
@@ -10,8 +10,8 @@
result_pages=Pages:
noHits=No results for {0}
noHitsPossibleReasons=
-builtWithSesat=Built with <a href="http://sesat.no">Sesat</a>
-poweredByYahoo=Results from Yahoo index
+builtWithSesat=Built with <a href="http://sesat.no">Sesat</a> using this <a
href="http://sesat.no/tutorial-building-sesamcom.html">tutorial</a>.
+resultsFromYahoo=Results from the Yahoo!
prev=previous
next=next
Modified:
trunk/generic.sesam/sesam.com/war/src/main/css/tab/default-sesam-com.css
===================================================================
--- trunk/generic.sesam/sesam.com/war/src/main/css/tab/default-sesam-com.css
2008-03-26 17:28:34 UTC (rev 6275)
+++ trunk/generic.sesam/sesam.com/war/src/main/css/tab/default-sesam-com.css
2008-03-26 20:45:46 UTC (rev 6276)
@@ -124,6 +124,7 @@
.more_hits_link {
color: #7777CC;
+ font-size: 0.9em;
}
.more_hits_link_hide {
color: #7777CC;
Modified:
trunk/generic.sesam/sesam.com/war/src/main/webapp/WEB-INF/classes/fragments/layout/sesam.com/footer.jsp
===================================================================
---
trunk/generic.sesam/sesam.com/war/src/main/webapp/WEB-INF/classes/fragments/layout/sesam.com/footer.jsp
2008-03-26 17:28:34 UTC (rev 6275)
+++
trunk/generic.sesam/sesam.com/war/src/main/webapp/WEB-INF/classes/fragments/layout/sesam.com/footer.jsp
2008-03-26 20:45:46 UTC (rev 6276)
@@ -26,5 +26,7 @@
<div id="footer_help">
<jsp:text><![CDATA[<span>©2008</span> ]]></jsp:text>
<search:text key="builtWithSesat"/>
+ <jsp:text><![CDATA[ ]]></jsp:text>
+ <search:text key="resultsFromYahoo"/>
</div>
</jsp:root>
\ No newline at end of file
Modified:
trunk/generic.sesam/sesam.com/war/src/main/webapp/WEB-INF/classes/pages/sesam.com/index.jsp
===================================================================
---
trunk/generic.sesam/sesam.com/war/src/main/webapp/WEB-INF/classes/pages/sesam.com/index.jsp
2008-03-26 17:28:34 UTC (rev 6275)
+++
trunk/generic.sesam/sesam.com/war/src/main/webapp/WEB-INF/classes/pages/sesam.com/index.jsp
2008-03-26 20:45:46 UTC (rev 6276)
@@ -28,14 +28,14 @@
<search:include include="head-element"/>
</head>
<body>
- <div id="frame">
+ <table id="frame"><tr><td><!-- use a table instead of a div here to get
automatic width plus centering. -->
<div id="header">
<search:include include="top-col-one" />
</div>
<div id="footer">
<search:include include="bottom-col-four" />
</div>
- </div>
+ </td></tr></table>
</body>
</html>
Property changes on: trunk/skin-archetype
___________________________________________________________________
Name: svn:ignore
+ target
Modified:
trunk/war/src/main/java/no/sesat/search/view/taglib/TextMessageTag.java
===================================================================
--- trunk/war/src/main/java/no/sesat/search/view/taglib/TextMessageTag.java
2008-03-26 17:28:34 UTC (rev 6275)
+++ trunk/war/src/main/java/no/sesat/search/view/taglib/TextMessageTag.java
2008-03-26 20:45:46 UTC (rev 6276)
@@ -36,8 +36,8 @@
import no.sesat.search.site.config.TextMessages;
/** Wraps functionality found in TextMessages into a custom tag.
- *
*
+ *
* @author <a href="mailto:[EMAIL PROTECTED]">Michael Semb Wever</a>
* @version $Id$
*/
@@ -53,37 +53,37 @@
* Initialization of args property.
*/
private final List<Object> args = new ArrayList<Object>();
-
+
/**Called by the container to invoke this tag.
* The implementation of this method is provided by the tag library
developer,
* and handles all tag processing, body iteration, etc.
- * @throws javax.servlet.jsp.JspException
+ * @throws javax.servlet.jsp.JspException
*/
@Override
public void doTag() throws JspException {
-
+
final PageContext cxt = (PageContext) getJspContext();
final JspWriter out = cxt.getOut();
-
+
try {
-
+
final JspFragment f = getJspBody();
- if (f != null){
+ if (f != null){
f.invoke(out);
}
final TextMessages text = (TextMessages)cxt.findAttribute("text");
-
+
out.print(text.getMessage(key, args.toArray()));
-
+
} catch (IOException ex) {
throw new JspException(ex.getMessage());
}
-
+
}
/**
* Setter for the key attribute.
- * @param value
+ * @param value
*/
public void setKey(final String value) {
this.key = value;
@@ -91,17 +91,17 @@
public void setDynamicAttribute(
final String uri,
- final String localName,
+ final String localName,
final Object value) throws JspException {
-
- assert localName.startsWith("args") : "Only dynamic attributes of
format argX are supported";
-
+
+ assert localName.startsWith("arg") : "Only dynamic attributes of
format argX are supported: " + localName;
+
final int i = Integer.valueOf(localName.replaceAll("arg", ""));
while(args.size() <= i){
args.add("");
}
args.set(i, value);
}
-
-
+
+
}
_______________________________________________
Kernel-commits mailing list
[email protected]
http://sesat.no/mailman/listinfo/kernel-commits