Changeset 113:a86753b74ed7 in iovar


Ignore:
Timestamp:
Feb 21, 2018, 12:39:58 AM (8 months ago)
Author:
Shawn Wilson <shawn@…>
Branch:
default
Parents:
112:f43f6d7e4c21 (diff), 111:bef11a19b1e7 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.
Phase:
public
Message:

saw_022118_3 - Increment version to 1.1 for the next developments.

Files:
7 edited

Legend:

Unmodified
Added
Removed
  • .hgtags

    r106 r113  
    11f79ac63c28c29d276775544c789dab3f9265993f jars_included
    2 86c705a16955968a9c1862656cb24618e872358a 1.0
     22b24983a76c2fcc4342589ded34750f9ea49a620 1.0
  • CHANGELOG

    r109 r113  
    33@%@~LICENSE~@%@
    44
     5saw_022118_3 - Increment version to 1.1 for the next developments.
     6
    57saw_022118_2 - Small interface adjustments. Name 1.0 branch.
    68
    79saw_022118_1 - Minimalistic shell interface for 1.0 release.
     10
     11saw_020518_1 - Add the new MultiShell app. Devices can now be installed with a .device file.
    812
    913saw_091117_1 - Add Utils.hexToBytes().
  • CHANGELOG

    r112 r113  
    22Copyright (C) 2011-2015 Lannocc Technologies
    33@%@~LICENSE~@%@
     4
     5saw_022118_3 - Increment version to 1.1 for the next developments.
     6
     7saw_022118_2 - Small interface adjustments. Name 1.0 branch.
    48
    59saw_022118_1 - Minimalistic shell interface for 1.0 release.
  • src/win/iovar/web/bin/shell/Interactive.java

    r109 r113  
    3131    public static final String CONFIG_URI = "local:/etc/interactive.conf";
    3232    public static final String PARAM_SHRC = "shrc";
     33    public static final String PARAM_STYLE = "iostyle";
    3334   
    3435    enum Config
     
    194195        try
    195196        {
    196             final Map<String,String> config = Utils.configMap (Transport.handler (CONFIG_URI, context, req.getSession ()).get ());
    197             final String style = config.get (Config.STYLE.toString ());
     197            String style = req.getParameter (PARAM_STYLE);
     198            if (style == null)
     199            {
     200                final Map<String,String> config = Utils.configMap (Transport.handler (CONFIG_URI, context, req.getSession ()).get ());
     201                style = config.get (Config.STYLE.toString ());
     202            }
    198203           
    199204            if (style!=null)
  • src/win/iovar/web/bin/shell/Interactive.java

    r112 r113  
    246246            out.println ("          <label id=\"cmd\">$ <input type=\"text\" id=\"cmd_in\" name=\""+Shell.PARAM_CMD+"\" size=\"60\"></label>");
    247247            out.println ("      </form>");
    248             out.println ("      <div id=\"output\"><iframe name=\"output\" width=\"800\" height=\"300\"> </iframe></div>");
     248            out.println ("      <iframe name=\"output\" width=\"800\" height=\"300\"> </iframe>");
    249249            out.println ("      <script language=\"javascript\"> document.getElementById ('cmd_in').focus (); </script>");
    250250            out.println ("  </body>");
  • src/win/iovar/web/bin/shell/Shell.java

    r107 r113  
    3030public class Shell extends HttpServlet
    3131{
    32     public static final String VERSION = "1.0";
     32    public static final String VERSION = "1.1-dev";
    3333   
    3434    //static final String INIT_PARAM_PARSER = "parser";
  • src/win/iovar/web/bin/shell/Shell.java

    r107 r113  
    3030public class Shell extends HttpServlet
    3131{
    32     public static final String VERSION = "1.0";
     32    public static final String VERSION = "1.1-dev";
    3333   
    3434    //static final String INIT_PARAM_PARSER = "parser";
Note: See TracChangeset for help on using the changeset viewer.