Author: sshyrkov
Date: Mon Nov 12 08:21:52 2007
New Revision: 19116
URL: https://svndev.jahia.net/websvn/listing.php?sc=3D1&rev=3D19116&repname=
=3Djahia
Log:
Added 'My Settings' and 'Search Results' pages
Modified:
branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/java/org/jahia/data/template=
s/JahiaTemplatesPackage.java
Modified: branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/java/org/jahia/data/te=
mplates/JahiaTemplatesPackage.java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-INCLUD=
E-TAG-BRANCH/core/src/java/org/jahia/data/templates/JahiaTemplatesPackage.j=
ava&rev=3D19116&repname=3Djahia
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/java/org/jahia/data/template=
s/JahiaTemplatesPackage.java (original)
+++ branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/java/org/jahia/data/template=
s/JahiaTemplatesPackage.java Mon Nov 12 08:21:52 2007
@@ -94,6 +94,10 @@
=
private String defaultPageName;
=
+ private String mySettingsPageName;
+ =
+ private String searchResultsPageName;
+ =
/** Contains names of the template sets starting from this one, then t=
he direct parent and so on. */
private List hierarchy =3D new LinkedList();
=
@@ -167,11 +171,12 @@
=
/**
* Set the Root Folder
- *
- * @param (String) the Root Folder of the templates
+ * =
+ * @param (String)
+ * the Root Folder of the templates
*/
- public void setRootFolder(String folder){
- if (StringUtils.isNotEmpty(folder)) {
+ public void setRootFolder(String folder) {
+ if (StringUtils.isNotEmpty(folder)) {
m_RootFolder =3D folder;
StringBuffer path =3D new StringBuffer(64).append(Jahia.getSet=
tings()
.getTemplatesContext());
@@ -185,8 +190,19 @@
m_RootFolder =3D "";
rootFolderPath =3D Jahia.getSettings().getTemplatesContext();
}
- } =
=
+ // need to recalculate pathes
+ for (Iterator iterator =3D templates.values().iterator(); iterator
+ .hasNext();) {
+ JahiaTemplateDef tempDef =3D (JahiaTemplateDef) iterator.next(=
);
+ if (tempDef.getParent() =3D=3D this) {
+ tempDef.setFilePath(new StringBuffer(64).append(
+ getRootFolderPath()).append('/').append(
+ tempDef.getFileName()).toString());
+ }
+ }
+ changesMade =3D true;
+ } =
=
/**
* Return the Classes File name
@@ -544,4 +560,20 @@
this.defaultPageName =3D defaultPageName;
changesMade =3D true;
}
+
+ public String getMySettingsPageName() {
+ return mySettingsPageName;
+ }
+
+ public void setMySettingsPageName(String mySettingsPageName) {
+ this.mySettingsPageName =3D mySettingsPageName;
+ }
+
+ public String getSearchResultsPageName() {
+ return searchResultsPageName;
+ }
+
+ public void setSearchResultsPageName(String searchResultsPageName) {
+ this.searchResultsPageName =3D searchResultsPageName;
+ }
}
\ No newline at end of file
_______________________________________________
cvs_list mailing list
[email protected]
http://lists.jahia.org/cgi-bin/mailman/listinfo/cvs_list