ref: refs/heads/master
commit 529387ddbd5ce0bf86b0dde05a024fe18806fe27
Author: Stefan Schubert
Date: Fri Nov 6 13:52:37 2009 +0100
removed old printer stuff which is not needed anymore
---
webclient/app/views/playground/index.rhtml | 118 --------------------------
webclient/public/icons/autodetected-22.png | Bin 1276 -> 0 bytes
webclient/public/icons/printer-22.png | Bin 791 -> 0 bytes
webclient/public/icons/printer-remote-22.png | Bin 1100 -> 0 bytes
webclient/public/icons/yast-bluetooth-22.png | Bin 994 -> 0 bytes
webclient/public/inc/yast.css | 31 +-------
webclient/public/inc/yast.helpers.js | 52 -----------
7 files changed, 1 insertions(+), 200 deletions(-)
diff --git a/webclient/app/views/playground/index.rhtml b/webclient/app/views/playground/index.rhtml
deleted file mode 100644
index 415f9bf..0000000
--- a/webclient/app/views/playground/index.rhtml
+++ /dev/null
@@ -1,118 +0,0 @@
-
-<div id="notifications">
-</div>
-
-<form class="container" method="post" action="">
- <div class="hbox">
- <div class="printers-list">
- <label for="printer-list">Configured printers</label>
- <table id="printer-list" class="list printers">
- <tbody>
-
- </tbody>
- </table>
- <input class="button jqModal" type="submit" value="Add" id="add-printer" />
- <input class="button disabled" disabled="true" type="submit" value="Remove" id="remove-printer"/>
- <input class="button disabled" disabled="true" type="submit" value="Edit" id="edit-printer"/>
- </div><!-- printers-list -->
- <div class="printer-info">
- <h3 class="title" id="printer-name">Printer Name</h3>
- <div><span class="label">Type:</span><span id="printer-type" class="property">Remote</span></div>
- <div><span class="label">Location:</span><span id="printer-location" class="property">ipp://</span></div>
- <div><span class="label">Status:</span><span id="printer-status" class="property">Ready</span></div>
- <label id="printer-shared" class="checkbox"><input type="checkbox"> Share this printer</label>
- </div>
- </div>
-
- <div class="hbox">
- <div>
- <label><span>Default Printer:</span>
- <select name="default-printer" size="1" id="default-printer">
-
- </select>
- </label>
- </div><div>
- <label><span>Default Paper Size:</span>
- <select name="default" size="1">
- <option>A4</option>
- <option>US Letter</option>
- </select>
- </label>
- </div>
- </div>
-</form>
-
-<div class="jqmWindow" id="addPrinterDialog">
-<form method="post" action="" id="printer-add-form">
- <a href="#" class="closebutton jqmClose">Close</a>
- <h2>Add Printer</h2>
-
- <div id="printer-types" class="notebook">
- <ul>
- <li><a href="#printers-autodetected"><span>Autodetected</span></a></li>
- <li><a href="#printers-network"><span>Network</span></a></li>
- <li><a href="#printers-bluetooth"><span>Bluetooth</span></a></li>
- </ul>
- <div id="printers-autodetected">
- <label for="autodetected-printers"><span>Detected Printers:</span></label>
- <table id="autodetected-printers" class="list printers">
- <tbody>
-
- </tbody>
- </table>
-
- <div class="hbox">
- <div>
- <label><span>Name:</span>
- <input class="" type="text" value="HP USB Printer" id="printer-auto-name" />
- </label>
- </div><div>
- <label><span>Print Driver:</span>
- <select name="printer-auto-driver" size="1" id="printer-auto-driver">
- <option value="driver-908326456">HP USB Printers (foozjs)</option>
- </select>
- </label>
- </div>
- </div>
- </div>
-
- <div id="printers-network">
-
- <table class="widgets">
- <tr>
- <td><label for="printer-net-protocol">Protocol:</label></td>
- <td>
- <select name="printer-net-protocol" size="1" id="printer-net-protocol">
- <option value="protocol-lpd">Unix Printing (LPD)</option>
- <option value="protocol-ipp">Internet Printing Protocol (IPP)</option>
- <option value="protocol-jetdirect">HP JetDirect (Socket)</option>
- </select>
- </td>
- </tr>
- <tr>
- <td><label for="printer-net-address">Address:</label></td>
- <td><input type="text" id="printer-net-address" name="printer-net-address" value="" /></td>
- </tr>
- <tr>
- <td><label for="printer-net-queue">Queue:</label></td>
- <td><input type="text" id="printer-net-queue" name="printer-net-queue" value="" /></td>
- </tr>
- <tr>
- <td><label for="printer-net-name">Name:</label></td>
- <td><input type="text" id="printer-net-name" name="printer-net-name" value="" /></td>
- </tr>
- </table>
- </div>
-
- <div id="printers-bluetooth">
- FIXME: Bluetooth
- </div>
-
- </div>
-
- <div class="dialogbuttons">
- <a href="#" class="button jqmClose">Close</a>
- <input class="button default jqClose" type="submit" value="Add" id="dialog-add-printer" />
- </div>
-</form>
-</div>
diff --git a/webclient/public/icons/autodetected-22.png b/webclient/public/icons/autodetected-22.png
deleted file mode 100644
index 89b7fde..0000000
Binary files a/webclient/public/icons/autodetected-22.png and /dev/null differ
diff --git a/webclient/public/icons/printer-22.png b/webclient/public/icons/printer-22.png
deleted file mode 100644
index 5593334..0000000
Binary files a/webclient/public/icons/printer-22.png and /dev/null differ
diff --git a/webclient/public/icons/printer-remote-22.png b/webclient/public/icons/printer-remote-22.png
deleted file mode 100644
index 7e99337..0000000
Binary files a/webclient/public/icons/printer-remote-22.png and /dev/null differ
diff --git a/webclient/public/icons/yast-bluetooth-22.png b/webclient/public/icons/yast-bluetooth-22.png
deleted file mode 100644
index 7f00213..0000000
Binary files a/webclient/public/icons/yast-bluetooth-22.png and /dev/null differ
diff --git a/webclient/public/inc/yast.css b/webclient/public/inc/yast.css
index 8fcc02e..31f3aed 100644
--- a/webclient/public/inc/yast.css
+++ b/webclient/public/inc/yast.css
@@ -302,7 +302,7 @@ textarea, input[type=text] {
/*
*
- * Subpages (Printers...)
+ * Subpages (Samba, Network,...)
*
*/
@@ -449,8 +449,6 @@ table.list {
.list .hidden {
display: none;
}
- #printer-list {
- }
.default.emblem {
position: absolute;
@@ -459,21 +457,6 @@ table.list {
background: url(../images/default-emblem.png) no-repeat center center;
}
-.printer-info {}
-
- .printer-info .label {
- display: inline-block;
- width: 7em;
- }
-
- .printer-info .property {
- font-weight: bold;
- }
-
- .printer-info>div {
- margin-bottom: 1em;
- }
-
select {
font-weight: bold;
}
@@ -487,15 +470,3 @@ table.widgets {
margin-top: 0;
}
-#printer-types li>a {
- padding-left: 32px;
- min-height: 22px;
-}
- a[href='#printers-autodetected'] { background: url(../icons/autodetected-22.png) no-repeat 6px 4px; }
- a[href='#printers-network'] { background: url(../icons/printer-remote-22.png) no-repeat 6px 4px; }
- a[href='#printers-bluetooth'] { background: url(../icons/yast-bluetooth-22.png) no-repeat 6px 4px; }
-
- #autodetected-printers {
- min-height: 100px;
- }
-
diff --git a/webclient/public/inc/yast.helpers.js b/webclient/public/inc/yast.helpers.js
index ce56c9e..d3454ca 100644
--- a/webclient/public/inc/yast.helpers.js
+++ b/webclient/public/inc/yast.helpers.js
@@ -3,56 +3,4 @@
};
(function($){
- $.fn.refreshPrinters = function (printers) {
- container = this;
- var rows = '';
-
-
- $.each(printers,function (i,printer){
- //console.log(i,printer);
- if($(container).is('tbody')) {
- var row = '<tr><td class="icon"><div class="container"><img src="icons/'
- +(printer.type==='remote' ? 'printer-remote-22.png':'printer-22.png') +'" />'
- +(printer.defaultp ? '<div class="default emblem"></div>': '')
- +'</div></td>'
- +'<td><div class="title'+(printer.defaultp ? ' default': '')+'"><a href="#">' + printer.name + '</a></div>'
- +'<span class="hidden uri">'+printer.URI+'</span>'
- +'<span class="hidden type">'+printer.type+'</span>'
- +'<span class="hidden shared">'+printer.shared+'</span>'
- +'<span class="hidden status">'+printer.status+'</span>'
- +'</td>'
- +'</tr>'
- rows += row;
- } else {
- var row = '
