* stone/snow/blue/lcars/xstyle add formbased login

* jason: remove session state from preview window
stone/snow/blue/lcars rename style.css depends skin name

23 files changed, 125 insertions, 6 deletions

diff --git a/skins/blue/login.tmpl b/skins/blue/login.tmpl
new file mode 120000
index 0000000..6f3a077
--- /dev/null
+++ b/skins/blue/login.tmpl
@@ -0,0 +1 @@
+../stone/login.tmpl
\ No newline at end of file
diff --git a/skins/blue/style.css b/skins/blue/style-blue.css
index 2d583e4..2d583e4 100644
--- a/skins/blue/style.css
+++ b/skins/blue/style-blue.css
diff --git a/skins/blue_flat/login.tmpl b/skins/blue_flat/login.tmpl
new file mode 120000
index 0000000..6f3a077
--- /dev/null
+++ b/skins/blue_flat/login.tmpl
@@ -0,0 +1 @@
+../stone/login.tmpl
\ No newline at end of file
diff --git a/skins/blue_flat/style.css b/skins/blue_flat/style-blue_flat.css
index 95a3038..95a3038 100644
--- a/skins/blue_flat/style.css
+++ b/skins/blue_flat/style-blue_flat.css
diff --git a/skins/jason/program.js b/skins/jason/program.js
index 7f22d7e..fed9285 100644
--- a/skins/jason/program.js
+++ b/skins/jason/program.js
@@ -241,7 +241,7 @@ Ext.xxv.programPreview = function(viewer) {
         region: 'south',

         cls:'preview',

         autoScroll: true,

-        stateful:true,

+        stateful:false,

         tbar: [ {

             id:'s',

             tooltip: Ext.xxv.NowGrid.prototype.szFindReRun,

diff --git a/skins/jason/recordings.js b/skins/jason/recordings.js
index 7e5fdef..4ff1dba 100644
--- a/skins/jason/recordings.js
+++ b/skins/jason/recordings.js
@@ -1106,7 +1106,7 @@ function createRecordingsView(viewer,id) {
         region: 'south',

         cls:'preview',

         autoScroll: true,

-        stateful:true,
+        stateful:false,
         timefield : timefield,
         layout: {
             type:'vbox'
diff --git a/skins/jason/remote.js b/skins/jason/remote.js
index 741d0dc..559be40 100644
--- a/skins/jason/remote.js
+++ b/skins/jason/remote.js
@@ -92,7 +92,7 @@ Ext.xxv.RemoteWindow = function() {
                  { scale: 'medium', scope: this, width: 32, iconCls: 'remote-backward-icon', handler: function() { this.onRemote('FastRew'); } }
                 ,{ xtype: 'spacer', width: 6 }
                 ,{ scale: 'medium', scope: this, width: 32, iconCls: 'remote-record-icon', handler: function() { this.onRemote('Record'); } }
-                ,{ scale: 'medium', scope: this, width: 32, iconCls: 'remote-playback-icon', handler: function() { this.onRemote('Playback'); } }
+                ,{ scale: 'medium', scope: this, width: 32, iconCls: 'remote-playback-icon', handler: function() { this.onRemote('Play'); } }
                 ,{ scale: 'medium', scope: this, width: 32, iconCls: 'remote-pause-icon', handler: function() { this.onRemote('Pause'); } }
                 ,{ scale: 'medium', scope: this, width: 32, iconCls: 'remote-stop-icon', handler: function() { this.onRemote('Stop'); } }
                 ,{ xtype: 'spacer', width: 6 }
diff --git a/skins/jason/timers.js b/skins/jason/timers.js
index 7b66dbf..14f164b 100644
--- a/skins/jason/timers.js
+++ b/skins/jason/timers.js
@@ -509,7 +509,7 @@ Ext.xxv.timerPreview = function(viewer) {
         region: 'south',

         cls:'preview',

         autoScroll: true,

-        stateful:true,

+        stateful:false,

         tbar: [ 
        {

              id:'s'

diff --git a/skins/jason/widgets/err.tmpl b/skins/jason/widgets/err.tmpl
new file mode 120000
index 0000000..91a3f59
--- /dev/null
+++ b/skins/jason/widgets/err.tmpl
@@ -0,0 +1 @@
+message.tmpl
\ No newline at end of file
diff --git a/skins/lcars/login.tmpl b/skins/lcars/login.tmpl
new file mode 120000
index 0000000..6f3a077
--- /dev/null
+++ b/skins/lcars/login.tmpl
@@ -0,0 +1 @@
+../stone/login.tmpl
\ No newline at end of file
diff --git a/skins/lcars/style.css b/skins/lcars/style-lcars.css
index 4ded372..4ded372 100644
--- a/skins/lcars/style.css
+++ b/skins/lcars/style-lcars.css
diff --git a/skins/lcars_flat/login.tmpl b/skins/lcars_flat/login.tmpl
new file mode 120000
index 0000000..6f3a077
--- /dev/null
+++ b/skins/lcars_flat/login.tmpl
@@ -0,0 +1 @@
+../stone/login.tmpl
\ No newline at end of file
diff --git a/skins/lcars_flat/style.css b/skins/lcars_flat/style-lcars_flat.css
index 12ecfbf..12ecfbf 100644
--- a/skins/lcars_flat/style.css
+++ b/skins/lcars_flat/style-lcars_flat.css
diff --git a/skins/snow/login.tmpl b/skins/snow/login.tmpl
new file mode 120000
index 0000000..6f3a077
--- /dev/null
+++ b/skins/snow/login.tmpl
@@ -0,0 +1 @@
+../stone/login.tmpl
\ No newline at end of file
diff --git a/skins/snow/style.css b/skins/snow/style-snow.css
index dd3d804..dd3d804 100644
--- a/skins/snow/style.css
+++ b/skins/snow/style-snow.css
diff --git a/skins/snow_flat/login.tmpl b/skins/snow_flat/login.tmpl
new file mode 120000
index 0000000..6f3a077
--- /dev/null
+++ b/skins/snow_flat/login.tmpl
@@ -0,0 +1 @@
+../stone/login.tmpl
\ No newline at end of file
diff --git a/skins/snow_flat/style.css b/skins/snow_flat/style-snow_flat.css
index 4361413..4361413 100644
--- a/skins/snow_flat/style.css
+++ b/skins/snow_flat/style-snow_flat.css
diff --git a/skins/stone/index.tmpl b/skins/stone/index.tmpl
index d854cf2..06b1458 100644
--- a/skins/stone/index.tmpl
+++ b/skins/stone/index.tmpl
@@ -4,7 +4,7 @@
 <?% lang = locale.split('_') %?>
 <html xmlns="http://www.w3.org/1999/xhtml" <?% IF lang.1 %?>xml:lang="<?% lang.0 %?>" lang="<?% lang.0 %?>"<?% ELSE %?>xml:lang="en" lang="en"<?% END %?>>
 <head>
-    <link rel="stylesheet" type="text/css" href="style.css" media="all" />
+    <link rel="stylesheet" type="text/css" href="style-<?% skin %?>.css" media="all" />
     <link rel="stylesheet" type="text/css" href="print.css" media="print" />
     <link rel="shortcut icon" href="favicon.ico" />
     <title><?% IF param.title.defined;param.title;ELSE %?>XXV<?% END %?></title>
diff --git a/skins/stone/login.tmpl b/skins/stone/login.tmpl
new file mode 100644
index 0000000..be9c1af
--- /dev/null
+++ b/skins/stone/login.tmpl
@@ -0,0 +1,61 @@
+<?xml version="1.0" encoding="<?% charset %?>"?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional"
+  "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">

+<?% lang = locale.split('_') %?>
+<html xmlns="http://www.w3.org/1999/xhtml" <?% IF lang.1 %?>xml:lang="<?% lang.0 %?>" lang="<?% lang.0 %?>"<?% ELSE %?>xml:lang="en" lang="en"<?% END %?>>
+<head>
+    <link rel="stylesheet" type="text/css" href="style-<?% skin %?>.css" media="all" />
+    <link rel="stylesheet" type="text/css" href="print.css" media="print" />
+    <link rel="shortcut icon" href="favicon.ico" />
+    <title><?% IF param.title.defined;param.title;ELSE %?>XXV<?% END %?></title>
+    <meta name="generator" content="XXV System - Version: <?% version %?>" />
+    <meta http-equiv="content-type" content="text/html; charset=<?% charset %?>" />
+    <meta http-equiv="content-script-type" content="text/javascript" />
+    <meta http-equiv="cache-control" content="no-cache" />
+    <meta http-equiv="pragma" content="no-cache" />
+    <meta name="robots" content="noindex,noarchive,nofollow" />
+</head>
+<body class="frame">
+<div id="body">
+<form method="post" action="?cmd=login">
+  <input type="hidden" name="__action" value="save" />
+  <table class="areatable" summary="">
+    <tr><td class="areahead"><div class="areahead"><?% gettext("Authorization required") %?></div></td></tr>
+    <tr>
+        <td class="areatext">
+            <table summary="">
+            <tr><td width="150" height="1"></td><td width="245" align="right"><img src="images/logo.png" /></td></tr>
+            <tr>
+                <td>
+                    <?% gettext("Username") %?> :
+                </td>
+                <td>
+                    <input style="width:245px;" type="text" name="__name" value="" />
+                </td>
+            </tr>
+            <tr>
+                <td>
+                    <?% gettext("Password") %?> :
+                </td>
+                <td>
+                    <input style="width:245px;" type="password" name="__password" value="" />
+                </td>
+            </tr>
+            <tr><td>&nbsp;</td><td>&nbsp;</td></tr>
+            <tr>
+                <td>
+                &nbsp;
+                </td>
+                 <td align="right">
+                    <input type="submit" value="<?% gettext("Login") %?>" />
+                </td>
+            </tr>
+        </table>
+      </td>
+    </tr>
+  <tr><td class="areabottom"></td></tr>
+</table>
+</form>
+</div>
+</body>
+</html>
diff --git a/skins/stone/style.css b/skins/stone/style-stone.css
index 742242b..742242b 100644
--- a/skins/stone/style.css
+++ b/skins/stone/style-stone.css
diff --git a/skins/stone/widgets/start.tmpl b/skins/stone/widgets/start.tmpl
index 718b7e8..19d27cf 100644
--- a/skins/stone/widgets/start.tmpl
+++ b/skins/stone/widgets/start.tmpl
@@ -5,7 +5,7 @@
 <?% lang = locale.split('_') %?>
 <html xmlns="http://www.w3.org/1999/xhtml" <?% IF lang.1 %?>xml:lang="<?% lang.0 %?>" lang="<?% lang.0 %?>"<?% ELSE %?>xml:lang="en" lang="en"<?% END %?>>
 <head>
-    <link rel="stylesheet" type="text/css" href="style.css" media="all" />
+    <link rel="stylesheet" type="text/css" href="style-<?% skin %?>.css" media="all" />
     <link rel="stylesheet" type="text/css" href="print.css" media="print" />
 <?% IF call == 'vtxpage' %?>
     <link rel="stylesheet" type="text/css" href="vtxgfx.css" media="all" />
diff --git a/skins/stone_flat/style.css b/skins/stone_flat/style-stone_flat.css
index 20499d8..20499d8 100644
--- a/skins/stone_flat/style.css
+++ b/skins/stone_flat/style-stone_flat.css
diff --git a/skins/xstyle/login.tmpl b/skins/xstyle/login.tmpl
new file mode 100644
index 0000000..92f2c43
--- /dev/null
+++ b/skins/xstyle/login.tmpl
@@ -0,0 +1,51 @@
+<?xml version="1.0" encoding="<?% charset %?>"?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional"
+  "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">

+<?% lang = locale.split('_') %?>
+<html xmlns="http://www.w3.org/1999/xhtml" <?% IF lang.1 %?>xml:lang="<?% lang.0 %?>" lang="<?% lang.0 %?>"<?% ELSE %?>xml:lang="en" lang="en"<?% END %?>>
+<head>
+    <link rel="stylesheet" type="text/css" href="style-<?% skin %?>.css" media="all" />
+    <link rel="stylesheet" type="text/css" href="print.css" media="print" />
+    <link rel="shortcut icon" href="favicon.ico" />
+    <title><?% IF param.title.defined;param.title;ELSE %?>XXV<?% END %?></title>
+    <meta name="generator" content="XXV System - Version: <?% version %?>" />
+    <meta http-equiv="content-type" content="text/html; charset=<?% charset %?>" />
+    <meta http-equiv="content-script-type" content="text/javascript" />
+    <meta http-equiv="cache-control" content="no-cache" />
+    <meta http-equiv="pragma" content="no-cache" />
+    <meta name="robots" content="noindex,noarchive,nofollow" />
+</head>
+<body>
+<form method="post" action="?cmd=login">
+  <input type="hidden" name="__action" value="save" />
+  <h1><?% gettext("Authorization required") %?></h1>
+  <table border='0' width='95%' style="margin-top:15px">
+            <tr><td width="150" height="1"></td><td width="245" align="right"><img src="images/xxv.gif" /></td></tr>
+            <tr>
+                <td>
+                    <?% gettext("Username") %?> :
+                </td>
+                <td>
+                    <input style="width:245px;" type="text" name="__name" value="" />
+                </td>
+            </tr>
+            <tr>
+                <td>
+                    <?% gettext("Password") %?> :
+                </td>
+                <td>
+                    <input style="width:245px;" type="password" name="__password" value="" />
+                </td>
+            </tr>
+            <tr>
+                <td>
+                &nbsp;
+                </td>
+                 <td align="right">
+                    <input type="submit" value="<?% gettext("Login") %?>" />
+                </td>
+            </tr>
+        </table>
+</form>
+</body>
+</html>