litvinovg/vivo
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merging Elly and my changes to upgrade-1.1.txt from rel-1.1-maint branch to trunk. Revisions: 1008 1082:1089 1146:1159 1162:1164

Browse source
This commit is contained in:
rjy7 2010-07-26 14:10:49 +00:00
parent be9082a691
commit ce720e7bb3
1 changed files with 370 additions and 358 deletions
Download patch file Download diff file Expand all files Collapse all files

56
doc/upgrade-1.1.txt
View file

@ -306,28 +306,32 @@ Language) extension.
Follow step A or B below, whichever is applicable to your site: Follow step A or B below, whichever is applicable to your site:
A. If you did not create a customized theme for your site in VIVO 1.0, but used A. If you did not create a customized theme for your site in VIVO 1.0, but used
the 1.0 vivo-basic theme in its original directory, you need not take any action the 1.0 vivo-basic theme in its original directory, you need not take any
in order to convert your site to the VIVO 1.1 theme. action in order to convert your site to the VIVO 1.1 theme.
B. If you created your own theme directory in VIVO 1.0, follow the steps below B. If you created your own theme directory in VIVO 1.0, follow the steps below
to upgrade your theme to VIVO 1.1. under sections "Templates," "Stylesheets," and "Site Icons" to upgrade your
theme to VIVO 1.1.
1. Copy the directory /vivo/themes/vivo-basic/templates into your theme 1. Templates
a. Copy the directory /vivo/themes/vivo-basic/templates into your theme
directory /vivo/themes/<your-theme-name>. directory /vivo/themes/<your-theme-name>.
2. Follow step a or b below, whichever is applicable to your theme. Then proceed to Steps 3 and 4: b. Follow step i or ii below, whichever is applicable to your theme.
a. If you did not apply any customizations to the JSPs in your VIVO 1.0 i. If you did not apply any customizations to the JSPs in your VIVO
theme, then you do not need to apply any additional changes to the 1.0 theme, then you do not need to apply any additional changes
VIVO 1.1 theme templates during the upgrade process. to the VIVO 1.1 theme templates during the upgrade process.
b. If you did apply customizations to the JSPs in your VIVO 1.0 theme, ii. If you did apply customizations to the JSPs in your VIVO 1.0
you will need to hand-replicate those modifications in the new theme theme,you will need to hand-replicate those modifications in the
template files. new theme template files.
The theme template content that was previously contained in three The theme template content that was previously contained in
JSP files is now contained in five FTL files. The correspondence three JSP files is now contained in five FTL files. The
between the 1.0 JSPs and the 1.1 FTLs is as follows: correspondence between the 1.0 JSPs and the 1.1 FTLs is as
follows:
identity.jsp => identity.ftl identity.jsp => identity.ftl
menu.jsp => menu.ftl and search.ftl menu.jsp => menu.ftl and search.ftl
@ -338,21 +342,29 @@ to upgrade your theme to VIVO 1.1.
(see section II). (see section II).
Because the FreeMarker Template Language uses many syntactic Because the FreeMarker Template Language uses many syntactic
conventions that will be familiar to template authors from JSP or conventions that will be familiar to template authors from JSP
other common templating systems, the translation of your JSP changes or other common templating systems, the translation of your JSP
into the new FTLs should be relatively straightforward. changes into the new FTLs should be relatively straightforward.
Consult the FreeMarker Template Author's Guide at Consult the FreeMarker Template Author's Guide at
http://freemarker.org/docs/dgui.html and the Reference at http://freemarker.org/docs/dgui.html and the Reference at
http://freemarker.org/docs/ref.html for complete documentation of http://freemarker.org/docs/ref.html for complete documentation
the syntax and available built-in constructs. Template authors need of the syntax and available built-in constructs. Template
not be concerned with the Programmer's Guide or Java API documentation. authors need not be concerned with the Programmer's Guide or
Java API documentation.
3. Remove the jsp directory from your themes directory. c. Remove the jsp directory from your themes directory.
4. VIVO 1.1 includes changes to vivo-basic stylesheets. If you modified 2. Stylesheets
VIVO 1.1 includes changes to vivo-basic stylesheets. If you modified
styles in your VIVO 1.0 theme, you will not be able to simply copy the styles in your VIVO 1.0 theme, you will not be able to simply copy the
1.0 stylesheets into your 1.1 theme, because you will then lose 1.1 1.0 stylesheets into your 1.1 theme, because you will then lose 1.1
style upgrades that your theme should pick up. Instead, you should style upgrades that your theme should pick up. Instead, you should
use the vivo-basic 1.1 stylesheets as a starting point, and manually use the vivo-basic 1.1 stylesheets as a starting point, and manually
merge your 1.0 style modifications in as needed. merge your 1.0 style modifications in as needed.
3. Site Icons
Copy the site icons from your 1.0 theme into the site_icons folder in
your 1.1 theme.