Changeset 7502


Ignore:
Timestamp:
Aug 10, 2018, 2:41:32 PM (3 years ago)
Author:
Nicklas Nordborg
Message:

References #2126: Add extension points to the Preferences and Contact information dialogs

Including scripts and stylesheets added by extensions.

Location:
trunk/www/my_base/user
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/www/my_base/user/preferences.jsp

    r7499 r7502  
    7070<%@ taglib prefix="base" uri="/WEB-INF/base.tld" %>
    7171<%@ taglib prefix="t" uri="/WEB-INF/tab.tld" %>
     72<%@ taglib prefix="ext" uri="/WEB-INF/extensions.tld" %>
    7273<%
    7374final SessionControl sc = Base.getExistingSessionControl(pageContext, true);
     
    124125  }
    125126
    126   JspContext context = ExtensionsControl.createContext(dc, pageContext, null, user);
    127   ExtensionsInvoker<StartPageAction> invoker = (ExtensionsInvoker<StartPageAction>)ExtensionsControl.useExtensions(context, "net.sf.basedb.clients.web.start-page");
    128   ExtensionsInvoker<TabAction> tabsInvoker = (ExtensionsInvoker<TabAction>)ExtensionsControl.useExtensions(context, EditUtil.EP_PREFIX_EDIT+"user-preferences");
     127  JspContext jspContext = ExtensionsControl.createContext(dc, pageContext, null, user);
     128  ExtensionsInvoker<StartPageAction> invoker = (ExtensionsInvoker<StartPageAction>)ExtensionsControl.useExtensions(jspContext, "net.sf.basedb.clients.web.start-page");
     129  ExtensionsInvoker<TabAction> tabsInvoker = (ExtensionsInvoker<TabAction>)ExtensionsControl.useExtensions(jspContext, EditUtil.EP_PREFIX_EDIT+"user-preferences");
    129130  %>
    130131  <base:page type="popup" title="<%="Preferences for "+HTML.encodeTags(user.getName())%>" id="preferences">
    131132  <base:head scripts="tabcontrol-2.js,~preferences.js" styles="tabcontrol.css">
     133    <ext:scripts context="<%=jspContext%>" />
     134    <ext:stylesheets context="<%=jspContext%>" />
    132135    <style>
    133136    .colorbox
  • trunk/www/my_base/user/settings.jsp

    r7501 r7502  
    5858<%@ taglib prefix="base" uri="/WEB-INF/base.tld" %>
    5959<%@ taglib prefix="t" uri="/WEB-INF/tab.tld" %>
     60<%@ taglib prefix="ext" uri="/WEB-INF/extensions.tld" %>
    6061<%
    6162final SessionControl sc = Base.getExistingSessionControl(pageContext, true);
     
    99100  String jsDateTimeFormat = HTML.javaScriptEncode(dateTimeFormat);
    100101  String htmlDateTimeFormat = HTML.encodeTags(dateTimeFormat);
    101   JspContext context = ExtensionsControl.createContext(dc, pageContext, null, user);
    102   ExtensionsInvoker<TabAction> tabsInvoker = (ExtensionsInvoker<TabAction>)ExtensionsControl.useExtensions(context, EditUtil.EP_PREFIX_EDIT+"user-information");
     102  JspContext jspContext = ExtensionsControl.createContext(dc, pageContext, null, user);
     103  ExtensionsInvoker<TabAction> tabsInvoker = (ExtensionsInvoker<TabAction>)ExtensionsControl.useExtensions(jspContext, EditUtil.EP_PREFIX_EDIT+"user-information");
    103104%>
    104105  <base:page type="popup" title="<%=title%>">
    105   <base:head scripts="tabcontrol-2.js,~settings.js" styles="tabcontrol.css" />
     106  <base:head scripts="tabcontrol-2.js,~settings.js" styles="tabcontrol.css">
     107    <ext:scripts context="<%=jspContext%>" />
     108    <ext:stylesheets context="<%=jspContext%>" />
     109  </base:head>
    106110  <base:body>
    107111    <h1><%=title%><base:help tabcontrol="settings" /></h1>
Note: See TracChangeset for help on using the changeset viewer.