Changeset 112:f43f6d7e4c21 in iovar


Ignore:
Timestamp:
Feb 21, 2018, 12:34:47 AM (2 months ago)
Author:
Shawn Wilson <shawn@…>
Branch:
default
Parents:
106:3d9a902a1bc0 (diff), 108:d7f6ab0f2942 (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:

merge

Files:
1 deleted
5 edited

Legend:

Unmodified
Added
Removed
  • CHANGELOG

    r104 r112  
    22Copyright (C) 2011-2015 Lannocc Technologies
    33@%@~LICENSE~@%@
     4
     5saw_022118_1 - Minimalistic shell interface for 1.0 release.
    46
    57saw_020518_1 - Add the new MultiShell app. Devices can now be installed with a .device file.
  • CHANGELOG

    r107 r112  
    44
    55saw_022118_1 - Minimalistic shell interface for 1.0 release.
     6
     7saw_020518_1 - Add the new MultiShell app. Devices can now be installed with a .device file.
    68
    79saw_091117_1 - Add Utils.hexToBytes().
  • LICENSE

    r108 r112  
    33Copyright (C) 2016-2018 Virgo Venture, Inc.
    44Copyright (C) 2011-2016 Lannocc Technologies
     5Copyright (C) 2011 Shawn A. Wilson [shawn@lannocc.com]
    56
    67Permission is hereby granted, free of charge, to any person obtaining a copy
  • src/win/iovar/web/bin/shell/Interactive.java

    r104 r112  
    11/*
    2  * Copyright (C) 2016-2017 Virgo Venture, Inc.
     2 * Copyright (C) 2016-2018 Virgo Venture, Inc.
    33 * Copyright (C) 2011-2015 Lannocc Technologies
    44 * @%@~LICENSE~@%@
     
    2323
    2424/**
    25  * Interactive shell.
     25 * Front-end interface for the web shell.
    2626 *
    2727 * @author  shawn@lannocc.com
     
    229229            final PrintWriter out = resp.getWriter ();
    230230
     231            out.println ("<!DOCTYPE html>");
    231232            out.println ("<html>");
    232233            out.println ("  <head>");
    233             out.println ("      <title>interactive shell</title>");
    234             out.println ("      <link rel=\"stylesheet\" type=\"text/css\" href=\"usr/include/iovar/ui/interactive.css\">");
     234            out.println ("      <title>$ # iovar shell</title>");
     235            out.println ("      <link rel=\"shortcut icon\" sizes=\"16x16\" href=\"usr/include/iovar/favicon/favicon-16.png\">");
     236            out.println ("      <link rel=\"icon\" sizes=\"16x16\" href=\"usr/include/iovar/favicon/favicon-16.png\">");
     237            out.println ("      <link rel=\"stylesheet\" type=\"text/css\" href=\"usr/include/iovar/shell.css\">");
    235238            out.println ("  </head>");
    236             out.println ("  <body onload=\"document.forms[0].elements['input'].focus()\">");
     239            out.println ("  <body onload=\"document.forms[0].elements['"+Shell.PARAM_CMD+"'].focus()\">");
     240           
     241            out.println ("      <h1><span title=\""+Interactive.class.getName ()+"\">iovar "+Shell.VERSION+"</span> | <a href=\"/var/log/shell\" target=\"log\">log</a></h1>");
    237242
    238243            out.println ("      <form target=\"output\" method=\"GET\">");
    239 
    240             out.println ("          <div id=\"session\">");
    241             out.println ("              <label>session: <input type=\"text\" name=\""+Shell.PARAM_SESSION+"\" value=\""+shell.getPath ()+"\"></label>");
    242             out.println ("              <br><a href=\"$/dev/log\" target=\"log\">log</a>");
    243             out.println ("          </div>");
    244             out.println ("          <p>"+Interactive.class.getName ());
    245             out.println ("          <br>"+Shell.class.getName ()+" version: "+Shell.VERSION);
    246             out.println ();
    247 
    248             out.println ("          <br><br>");
    249             //out.println ("      <iframe name=\"log\" width=\"800\" height=\"200\" src=\"dev/log\" scrolling=\"yes\" style=\"overflow:scroll; white-space:nowrap\"> </iframe>");
    250             //out.println ("      <br><a href=\"javascript:window.frames[0].location.reload()\" style=\"float:right\">refresh log</a>");
    251             out.println ();
    252 
     244            out.println ("          <input type=\"hidden\" name=\""+Shell.PARAM_SESSION+"\" value=\""+shell.getPath ()+"\">");
    253245            out.println ("          <input id=\"cmd_exec\" type=\"submit\" value=\"exec\">");
    254246            out.println ("          <label id=\"cmd\">$ <input type=\"text\" id=\"cmd_in\" name=\""+Shell.PARAM_CMD+"\" size=\"60\"></label>");
  • src/win/iovar/web/bin/shell/Interactive.java

    r107 r112  
    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)
Note: See TracChangeset for help on using the changeset viewer.