tazpanel rev 384

New style and use /usr/bin/tazpanel to lauch a browser
author: Christophe Lincoln <pankso@slitaz.org>
date: Thu Feb 20 00:07:26 2014 +0100 (2014-02-20)
parents: d1dbbf42b25e
children: 32170f52a71c
files: data/tazpanel.desktop styles/default/header.html styles/default/images/logo.png styles/default/style.css tazpanel
     1.1 --- a/data/tazpanel.desktop	Wed Feb 19 09:36:22 2014 +0000
     1.2 +++ b/data/tazpanel.desktop	Thu Feb 20 00:07:26 2014 +0100
     1.3 @@ -10,7 +10,6 @@
     1.4  Comment[pt_BR]=Painel de configuração e administração do SliTaz
     1.5  Comment[ru]=Панель администрирования и настройки SliTaz
     1.6  Comment[sv]=SliTaz administration och konfigurations panel
     1.7 -TryExec=browser
     1.8 -Exec=browser http://tazpanel:82/
     1.9 +Exec=tazpanel
    1.10  Icon=tazpanel
    1.11  Categories=System;

     2.1 --- a/styles/default/header.html	Wed Feb 19 09:36:22 2014 +0000
     2.2 +++ b/styles/default/header.html	Thu Feb 20 00:07:26 2014 +0100
     2.3 @@ -22,6 +22,10 @@
     2.4  </head>
     2.5  <body onload="showLoading()">
     2.6  
     2.7 +<div id="header">
     2.8 +	<h1>$TITLE</h1>
     2.9 +</div>
    2.10 +
    2.11  <div id="toolbar">
    2.12  	<div id="icons">
    2.13  		<a href="/help.cgi">
    2.14 @@ -91,10 +95,6 @@
    2.15  	</ul>
    2.16  </div>
    2.17  
    2.18 -<div id="header">
    2.19 -	<h1>$TITLE</h1>
    2.20 -</div>
    2.21 -
    2.22  <!-- Page content -->
    2.23  <div id="content">
    2.24  EOT

     4.1 --- a/styles/default/style.css	Wed Feb 19 09:36:22 2014 +0000
     4.2 +++ b/styles/default/style.css	Thu Feb 20 00:07:26 2014 +0100
     4.3 @@ -8,16 +8,16 @@
     4.4  }
     4.5  
     4.6  body {
     4.7 -	background: #ffffff;
     4.8 +	background: #fff;
     4.9  	color: black;
    4.10  	font: 13px "DejaVu Sans", Ubuntu, "Droid Sans", "Liberation Sans", FreeSans, sans-serif;
    4.11 -	margin: 25px 0 0;
    4.12 +	margin: 80px 0 0;
    4.13  }
    4.14  
    4.15 -h1 { color: #d66018; padding: 6px 0 0 20px; font-size: 180%; }
    4.16 -h2 { color: #444; margin: 10px 0 10px; font-size: 150%; }
    4.17 -h3 { color: #666; font-size: 140%; }
    4.18 -h4 { color: #888; font-size: 120%; margin: 10px 0 5px; }
    4.19 +h1 { margin: 0; padding: 8px; color: #fff; font-size: 20px; }
    4.20 +h2 { color: #333; margin: 10px 0 10px; font-size: 180%; }
    4.21 +h3 { color: #444; font-size: 160%; }
    4.22 +h4 { color: #666; font-size: 140%; }
    4.23  img { border: 0pt none; vertical-align: middle; padding: 0px 6px 2px 0;}
    4.24  p { margin: 10px 0; }
    4.25  ul { list-style-type: square; }
    4.26 @@ -28,15 +28,25 @@
    4.27  /* Header and main title */
    4.28  
    4.29  #header {
    4.30 -	height: 42px;
    4.31 -	border-bottom: 1px dotted #ddd;
    4.32 +	height: 40px;
    4.33 +	/*border-bottom: 4px solid #afafaf;*/
    4.34 +	background: #222 url(images/logo.png) no-repeat left;
    4.35 +	position: fixed;
    4.36 +	top: 0;
    4.37 +	width: 100%;
    4.38 +}
    4.39 +
    4.40 +#header h1 {
    4.41 +	margin: 0;
    4.42 +	padding: 8px 0 0 42px;
    4.43 +	font-style: italic;
    4.44  }
    4.45  
    4.46  /* Desktop gui style bar */
    4.47  
    4.48  #toolbar {
    4.49  	position: fixed;
    4.50 -	top: 0;
    4.51 +	top: 40px;
    4.52  	left: 0;
    4.53  	height: 23px;
    4.54  	width: 100%;
    4.55 @@ -67,8 +77,6 @@
    4.56  #menu li a:hover {
    4.57  	color: #ffffff;
    4.58  	background-color: #d66018;
    4.59 -	border-top-right-radius: 3px;
    4.60 -	border-top-left-radius: 3px;
    4.61  }
    4.62  #menu li ul {
    4.63  	display: none;
    4.64 @@ -77,7 +85,7 @@
    4.65  	border: 1px solid #c1baad;
    4.66  }
    4.67  #menu li ul a {
    4.68 -	padding: 4px 6px;
    4.69 +	padding: 4px 6px 2px;
    4.70  }
    4.71  #menu li:hover ul {
    4.72  	display: block;
    4.73 @@ -123,7 +131,7 @@
    4.74  	color: #666;
    4.75  	cursor: progress;
    4.76  	position: fixed;
    4.77 -	top: 92px;
    4.78 +	top: 76px;
    4.79  	right: 120px;
    4.80  	width: 248px;
    4.81  	padding: 4px 4px 2px;
    4.82 @@ -137,7 +145,7 @@
    4.83  
    4.84  #sidebar {
    4.85  	position: fixed;
    4.86 -	top: 92px;
    4.87 +	top: 124px;
    4.88  	right: 5px;
    4.89  	width: 116px;
    4.90  }
    4.91 @@ -153,7 +161,7 @@
    4.92  	font-weight: bold;
    4.93  }
    4.94  
    4.95 -#sidebar h4 { margin: 0 0 2px 12px; }
    4.96 +#sidebar h4 { margin: 0 0 2px 12px; font-size: 16px; color: #222; }
    4.97  #sidebar ul { list-style-type: none; padding: 0; }
    4.98  
    4.99  
   4.100 @@ -161,19 +169,19 @@
   4.101  
   4.102  #content { margin: 20px; }
   4.103  #content-sidebar { margin: 20px 120px 20px 20px; }
   4.104 -#wrapper { margin: 10px 0 20px; }
   4.105 +#wrapper, .wrapper { margin: 20px 0; }
   4.106  
   4.107  #actions {
   4.108  	min-height: 20px;
   4.109 -	padding: 16px 0;
   4.110 +	padding: 0;
   4.111  }
   4.112  
   4.113  #actions p { margin: 6px 0; }
   4.114  
   4.115  .search {
   4.116 -	position: absolute;
   4.117 -	right: 40px;
   4.118 -	top: 23px;
   4.119 +	position: fixed;
   4.120 +	right: 10px;
   4.121 +	top: -8px;
   4.122  }
   4.123  
   4.124  .search input[type=submit] {
   4.125 @@ -197,7 +205,7 @@
   4.126  .search input[type=text] {
   4.127  	border: 1px solid #ddd;
   4.128  	padding: 4px;
   4.129 -	height: 17px;
   4.130 +	height: 18px;
   4.131  	margin: 0;
   4.132  	width: 200px;
   4.133  	border-top-left-radius: 4px;
   4.134 @@ -234,12 +242,11 @@
   4.135  	float: right;
   4.136  }
   4.137  
   4.138 -
   4.139  /* Table */
   4.140  
   4.141  table {
   4.142  	background-color: #f8f8f8;
   4.143 -	border: 1px solid #ddd;
   4.144 +	border: 4px solid #ddd;
   4.145  	padding: 10px;
   4.146  	width: 100%;
   4.147  	margin: 0 0 6px 0;
   4.148 @@ -266,7 +273,7 @@
   4.149  table.zebra {
   4.150  	border: none;
   4.151  	border-collapse: collapse;
   4.152 -	margin: 0;
   4.153 +	margin: 20px 0;
   4.154  }
   4.155  table.zebra tr:nth-child(even) {
   4.156  	background-color: rgba(0,0,0,0.05);
   4.157 @@ -279,9 +286,11 @@
   4.158  }
   4.159  table.zebra td + td {
   4.160  	border-left: 1px solid #ddd;
   4.161 +	height: 22px;
   4.162  }
   4.163 +table.zebra td:first-child { padding-left: 6px; }
   4.164  .outbox {
   4.165 -	box-shadow: 0 0 0 2px #fff, 0 0 0 3px #ccc;
   4.166 +	box-shadow: 0 0 0 4px #ddd, 0 0 0 4px #ddd;
   4.167  }
   4.168  .fixed {
   4.169  	table-layout: fixed;
   4.170 @@ -311,7 +320,7 @@
   4.171  pre, .pre-main {
   4.172  	font: 13px "DejaVu Sans Mono", "Droid Sans Mono", "Liberation Mono", FreeMono, monospace;
   4.173  	background-color: #f8f8f8;
   4.174 -	border: 1px solid #ddd;
   4.175 +	border: 4px solid #ddd;
   4.176  	padding: 10px;
   4.177  	margin: 10px 0;
   4.178  	overflow: auto;
   4.179 @@ -320,13 +329,29 @@
   4.180  .pre-main { margin: 16px 0; }
   4.181  
   4.182  input[type=submit], select, .button {
   4.183 +	color: #444444;
   4.184 +	border: 1px solid #afafaf;
   4.185  	padding: 4px;
   4.186 -	margin: 0;
   4.187 -	background-color: #f1f1f1;
   4.188 -	border: 1px solid #ddd;
   4.189 -	cursor: pointer;
   4.190 -	color: #000;
   4.191 +	margin: 4px 0px;
   4.192 +	font-size: 14px;
   4.193 +	line-height: 1.2em;
   4.194 +	background-image: -webkit-linear-gradient(#FAFAFA, #F4F4F4 40%, #E5E5E5);
   4.195 +	background-image: -moz-linear-gradient(#FAFAFA, #F4F4F4 40%, #E5E5E5);
   4.196 +	-webkit-appearance: none;
   4.197 +	-webkit-padding-end: 12px;
   4.198 +	-webkit-padding-start: 6px;
   4.199  }
   4.200 +input[type="submit"] {
   4.201 +	-webkit-box-shadow: 0px 1px 3px rgba(0, 0, 0, 0.1);
   4.202 +	-moz-box-shadow: 0px 1px 3px rgba(0, 0, 0, 0.1);
   4.203 +	box-shadow: 0px 1px 3px rgba(0, 0, 0, 0.1);
   4.204 +}
   4.205 +/*select { 
   4.206 +	background-image: url(images/down.png), 
   4.207 +		-webkit-linear-gradient(#FAFAFA, #F4F4F4 40%, #E5E5E5);
   4.208 +	background-position: center right;
   4.209 +	background-repeat: no-repeat;
   4.210 +}*/
   4.211  a.button {
   4.212  	white-space: nowrap;
   4.213  	height: 16px;
   4.214 @@ -349,8 +374,7 @@
   4.215  	background: #000;
   4.216  	color: #fff;
   4.217  	border: 1px solid #444;
   4.218 -	min-height: 180px;
   4.219 -	opacity: 0.8;
   4.220 +	min-height: 240px;
   4.221  }
   4.222  
   4.223  /* Round corner */
   4.224 @@ -403,7 +427,6 @@
   4.225  	margin: -18px auto 0 2px;
   4.226  }
   4.227  
   4.228 -
   4.229  a.button, input {
   4.230  	-webkit-transition: all 0.3s ease-in-out;
   4.231  	-moz-transition: all 0.3s ease-in-out;
   4.232 @@ -412,16 +435,17 @@
   4.233  	transition: all 0.3s ease-in-out;
   4.234  }
   4.235  
   4.236 -section {
   4.237 +/*section {
   4.238  	margin: 20pt -0.7em;
   4.239 -	padding: 0.7em;
   4.240 +	padding: 0.8em 0.7em 1.2em;
   4.241  	background-color: #fdfdfd;
   4.242  	border: 1px solid #ddd;
   4.243  	border-radius: 1em;
   4.244 -	/*box-shadow: 0 0 3pt 2pt #eee;*/
   4.245 +	box-shadow: 0 0 3pt 2pt #eee;
   4.246  }
   4.247  section h4 {
   4.248  	margin: 0 0 0.5em 0;
   4.249  }
   4.250  section h3 {
   4.251 -	margin: 0 0 0.5em 0;
   4.252 +	margin: 0 0 0.5em 0; }
   4.253 +*/

     5.1 --- a/tazpanel	Wed Feb 19 09:36:22 2014 +0000
     5.2 +++ b/tazpanel	Thu Feb 20 00:07:26 2014 +0100
     5.3 @@ -8,15 +8,13 @@
     5.4  
     5.5  # Get the configuration file and functions
     5.6  CONFIG="/etc/slitaz/tazpanel.conf"
     5.7 -[ -f $CONFIG ] && . $CONFIG
     5.8 -[ -f data/tazpanel.conf ] && . data/tazpanel.conf
     5.9 -[ ! -f $PANEL/lib/libtazpanel ] && \
    5.10 -	echo "No config file or libtazpanel found: $CONFIG" && exit 1
    5.11 -. $PANEL/lib/libtazpanel
    5.12 +[ -f "$CONFIG" ] && . $CONFIG
    5.13 +[ -f "data/tazpanel.conf" ] && . data/tazpanel.conf
    5.14 +[ ! "$PANEL" ] && echo "No config file found: $CONFIG" && exit 1
    5.15 +
    5.16  . /lib/libtaz.sh
    5.17  
    5.18  # I18n
    5.19 -. /usr/bin/gettext.sh
    5.20  TEXTDOMAIN='tazpanel'
    5.21  export TEXTDOMAIN
    5.22  
    5.23 @@ -30,11 +28,15 @@
    5.24  PIDFILE=/var/run/$NAME.pid
    5.25  
    5.26  case "$1" in
    5.27 +	-h|*help|*usage)
    5.28 +		echo ""
    5.29 +		gettext 'Usage: tazpanel [start|stop|passwd|app]'; echo
    5.30 +		echo "" ;;
    5.31  	start)  
    5.32 -	        if [ -f $PIDFILE ]; then
    5.33 +		if [ -f $PIDFILE ]; then
    5.34  	        gettext 'TazPanel is already running.'; echo
    5.35 -	        exit 1
    5.36 -	        fi
    5.37 +			exit 1
    5.38 +		fi
    5.39  		eval_gettext 'Starting TazPanel web server on port $HTTPD_PORT...'
    5.40  		httpd -p $HTTPD_PORT -u root -c $HTTPD_CONF \
    5.41  			-r "$(gettext 'TazPanel Authentication - Default: root:root')" &
    5.42 @@ -58,9 +60,16 @@
    5.43  		gettext 'Password changed successfully'; echo
    5.44  		echo "" ;;
    5.45  	*)
    5.46 -		echo ""
    5.47 -		gettext 'Usage: tazpanel [start|stop|passwd]'; echo
    5.48 -		echo "" ;;
    5.49 +		. /etc/slitaz/applications.conf
    5.50 +		USER_CONFIG="$HOME/.config/slitaz/applications.conf"
    5.51 +		[ -f  "$USER_CONFIG" ] && . $USER_CONFIG
    5.52 +		[ "$1" ] && app="/${1}.cgi"
    5.53 +		echo http://localhost:82${app}
    5.54 +		case "$BROWSER" in
    5.55 +			tazweb) tazweb --notoolbar http://localhost:82${app} & ;;
    5.56 +			midori) midori --app=http://localhost:82${app} & ;;
    5.57 +			*) $BROWSER http://localhost:82${app} & ;;
    5.58 +		esac ;;
    5.59  esac
    5.60  
    5.61  exit 0
author	Christophe Lincoln <pankso@slitaz.org>
date	Thu Feb 20 00:07:26 2014 +0100 (2014-02-20)
parents	d1dbbf42b25e
children	32170f52a71c
files	data/tazpanel.desktop styles/default/header.html styles/default/images/logo.png styles/default/style.css tazpanel