Changeset 21512

Show
Ignore:
Timestamp:
06/27/07 19:11:30 (1 year ago)
Author:
jmorliaguet
Message:

- insert the base URL automatically (NXP-1274)

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • org.nuxeo.theme/trunk/nuxeo-theme-jsf-editor/src/main/resources/nxthemes/jsf/editor/widgets/theme-view.xml

    r21503 r21512  
    22  xmlns:nxthemes="http://nuxeo.org/nxthemes" 
    33  xmlns:f="http://java.sun.com/jsf/core" 
    4   xmlns:c="http://java.sun.com/jstl/core" 
    54  xmlns:ui="http://java.sun.com/jsf/facelets"> 
    65  <head> 

  • org.nuxeo.theme/trunk/nuxeo-theme-jsf/src/main/java/org/nuxeo/theme/jsf/component/UIHead.java

    r21503 r21512  
    2020 
    2121import javax.faces.component.UIOutput; 
     22import javax.faces.context.ExternalContext; 
    2223import javax.faces.context.FacesContext; 
    2324import javax.faces.context.ResponseWriter; 
     25import javax.servlet.ServletRequest; 
    2426 
    2527import org.apache.commons.logging.Log; 
    …… 
    2931import org.nuxeo.theme.elements.ThemeElement; 
    3032import org.nuxeo.theme.formats.widgets.Widget; 
     33import org.nuxeo.theme.jsf.URLUtils; 
    3134 
    3235public class UIHead extends UIOutput { 
    …… 
    3740    public void encodeAll(final FacesContext context) throws IOException { 
    3841        final ResponseWriter writer = context.getResponseWriter(); 
    39         final URL themeUrl = (URL) context.getExternalContext().getRequestMap().get( 
     42        final ExternalContext externalContext = (ExternalContext) context.getExternalContext(); 
     43        final URL themeUrl = (URL) externalContext.getRequestMap().get( 
    4044                "nxthemesThemeUrl"); 
    4145        final ThemeElement theme = Manager.getThemeManager().getThemeByUrl( 
    …… 
    6670 
    6771        // Styles 
    68         final String contextPath = context.getExternalContext().getRequestContextPath(); 
     72        final String contextPath = externalContext.getRequestContextPath(); 
    6973        writer.write(String.format( 
    7074                "<link rel=\"stylesheet\" type=\"text/css\" media=\"all\" href=\"/nuxeo/nxthemes-css/?path=%s\"/>", 
    …… 
    7276 
    7377        // Base URL 
    74         // TODO 
     78        final ServletRequest request = (ServletRequest) externalContext.getRequest(); 
     79        final String baseUrl = URLUtils.getBaseURL(request); 
     80        if (baseUrl != null) { 
     81            writer.write(String.format("<base href=\"%s\" />", baseUrl)); 
     82        } 
    7583    } 
    7684} 

  • org.nuxeo.theme/trunk/nuxeo-theme-jsf/src/main/resources/nxthemes/jsf/widgets/theme-view.xml

    r21503 r21512  
    11<html xmlns="http://www.w3.org/1999/xhtml" 
    22  xmlns:nxthemes="http://nuxeo.org/nxthemes" 
    3   xmlns:c="http://java.sun.com/jstl/core" 
    43  xmlns:ui="http://java.sun.com/jsf/facelets"> 
    54  <head> 
    …… 
    87    </title> 
    98 
     9    <ui:insert name="bookmark"><!-- Bookmark URL --></ui:insert> 
     10 
    1011    <nxthemes:head /> 
    11  
    12     <ui:insert name="bookmark"><!-- Bookmark URL --></ui:insert> 
    13     <ui:insert name="baseURL"><!-- Base URL --></ui:insert> 
    1412 
    1513    <nxthemes:resources />