From 6320fa9c2e21a8a5b87876e3e1fd65f0de402c45 Mon Sep 17 00:00:00 2001 From: Simon Date: Wed, 6 Apr 2011 17:36:56 +0200 Subject: Layout/Ansicht geändert, BootIso, BootOs,Client,Config,Preboot & Session --- .../modules/user/views/scripts/bootiso/index.phtml | 95 ++++++++++------- .../modules/user/views/scripts/bootos/index.phtml | 115 ++++++++++++--------- .../modules/user/views/scripts/client/index.phtml | 66 ++++++++---- .../modules/user/views/scripts/config/index.phtml | 79 ++++++++------ .../modules/user/views/scripts/preboot/index.phtml | 71 ++++++++----- .../modules/user/views/scripts/session/index.phtml | 85 ++++++++++----- public/media/css/style.css | 6 +- public/media/css/user.css | 81 ++++++++++++++- 8 files changed, 404 insertions(+), 194 deletions(-) diff --git a/application/modules/user/views/scripts/bootiso/index.phtml b/application/modules/user/views/scripts/bootiso/index.phtml index 526edc0..0d175e8 100644 --- a/application/modules/user/views/scripts/bootiso/index.phtml +++ b/application/modules/user/views/scripts/bootiso/index.phtml @@ -4,31 +4,27 @@ formButton('createbootiso', 'Create BootISO', array( 'onclick' => 'self.location="/user/bootiso/createbootiso/page/'.$this->page.'"', 'class' => 'addbutton'))?> - - - - - - - - - - - - - bootisolist)==0) - echo "
ID bootosIDTitle titleGroupID groupIDPrebootID prebootIDSerialnumber serialnumberChanged createdExpires expiresPublic publicActions
There are no BootISO's entries to display." ?> - bootisolist as $bootiso): ?> - - escape($bootiso->getID()); ?> - escape($bootiso->getTitle()); ?> - escape($bootiso->getGroupID()); ?> - escape($bootiso->getPrebootID()); ?> - escape($bootiso->getSerialnumber()); ?> - escape($bootiso->getCreated()); ?> - escape($bootiso->getExpires()); ?> - escape($bootiso->getPublic()); ?> - + bootisolist as $bootiso): ?> +
+
escape($bootiso->getID()); ?>
+
+
+ Download BootMedium - Download BootMedium + Edit BootISO - Edit BootISO + Delete BootISO - - - -pagination; ?> + true) ?>">Delete BootISO +
+
escape($bootiso->getTitle()); ?>
+
Serialnumber: escape($bootiso->getSerialnumber()); ?>
+
+ +
escape($bootiso->getGroupID()); ?>
+ +
escape($bootiso->getPrebootID()); ?>
+ +
escape($bootiso->getCreated()); ?>
+ +
escape($bootiso->getExpires()); ?>
+ +
escape($bootiso->getPublic()); ?>
+
+
+
+
+ + +pagination; ?> - - - + diff --git a/application/modules/user/views/scripts/bootos/index.phtml b/application/modules/user/views/scripts/bootos/index.phtml index 0ea8f77..cb2a3aa 100644 --- a/application/modules/user/views/scripts/bootos/index.phtml +++ b/application/modules/user/views/scripts/bootos/index.phtml @@ -9,39 +9,31 @@ 'onclick' => 'self.location="/user/bootos/createbootos/page/'.$this->page.'"', 'class' => 'addbutton'))?> - - - - - - - - - - - - - - - +
+
Available searchfilter:
+
bootosID
+
title
+
groupID
+
configID
+
init
+
kernel
+
kcl
+
description
+
changed
+
expires
+
public
+
+ +
bootoslist)==0) - echo "
ID bootosIDTitle titleGroupID groupIDConfigID configIDInit initKernel kernelKcl kclDescription descriptionChanged ChangedExpires expiresPublic publicActions
There are no BootOs's to display." ?> + echo "There are no BootOs's to display." ?> bootoslist as $bootos): ?> - - escape($bootos->getID()); ?> - escape($bootos->getTitle()); ?> - escape($bootos->getGroupID()); ?> - escape($bootos->getConfigID()); ?> - escape($bootos->getPath_init()); ?> - escape($bootos->getPath_kernel()); ?> - escape($bootos->getDefaultkcl()); ?> - escape($bootos->getDescription()); ?> - escape($bootos->getCreated()); ?> - escape($bootos->getExpires()); ?> - escape($bootos->getPublic()); ?> - update[$bootos->getID()]==true): ?> - url( array( 'module' => 'user', 'controller' => 'bootos', @@ -51,11 +43,10 @@ ), 'default', true, false) ?>">Updates available - - No updates available - - url( array( 'module' => 'user', 'controller' => 'bootos', @@ -64,9 +55,8 @@ 'page' => $this->page ), 'default', - true, false) ?>">Edit BootOS - Edit BootOS + Delete BootOS - + true) ?>">Delete BootOS + +
escape($bootos->getTitle()); ?>
+
escape($bootos->getDescription()); ?>
+
+ +
escape($bootos->getGroupID()); ?>
+ +
escape($bootos->getConfigID()); ?>
+ +
escape($bootos->getPath_init()); ?>
+ +
escape($bootos->getPath_kernel()); ?>
+ +
escape($bootos->getDefaultkcl()); ?>
+ +
escape($bootos->getCreated()); ?>
+ +
escape($bootos->getExpires()); ?>
+ +
escape($bootos->getPublic()); ?>
+ +
+ +
+ - -pagination; ?> - - - - + +pagination; ?> + diff --git a/application/modules/user/views/scripts/client/index.phtml b/application/modules/user/views/scripts/client/index.phtml index 95bf7a2..6b7c43f 100644 --- a/application/modules/user/views/scripts/client/index.phtml +++ b/application/modules/user/views/scripts/client/index.phtml @@ -4,19 +4,22 @@ formButton('createbootos', 'Create Client', array( 'onclick' => 'self.location="/user/client/addclient/page/'.$this->page.'"', 'class' => 'addbutton'))?> +
+
Available searchfilter:
+
clientID
+
macadress
+
hardwarehash
+
-clients): ?> - - - - - - +
+ clients)==0) + echo "There are no Clients to display." ?> clients as $client): ?> -
- - - - - - -
MAC macadressHardwarehash hardwarehashActions
escape($client['macadress']) ?>escape($client['hardwarehash']) ?>url( array( 'module' => 'user', 'controller' => 'client', @@ -25,8 +28,8 @@ 'page' => $this->page ), 'default', - true) ?>">Edit ClientEdit Client + Delete Client
- pagination; ?> - -

There are no clients to display.

- + true) ?>">Delete Client + + + +
+ +
escape($client['macadress']) ?>
+ +
escape($client['hardwarehash']) ?>
+
+ +
+ + + + +pagination; ?> + + diff --git a/application/modules/user/views/scripts/config/index.phtml b/application/modules/user/views/scripts/config/index.phtml index 0b62f7e..aa68975 100644 --- a/application/modules/user/views/scripts/config/index.phtml +++ b/application/modules/user/views/scripts/config/index.phtml @@ -5,29 +5,24 @@ formButton('createconfig', 'Create Config', array( 'onclick' => 'self.location="/user/config/createconfig/page/'.$this->page.'"', 'class' => 'addbutton'))?> +
+
Available searchfilter:
+
title
+
shellscript
+
created
+
- - - - - - - - - - - - configlist)==0) - echo "
ID configIDTitle titleShellscript shellscriptChanged createdActions
There are no Config's to display." ?> - configlist as $config): ?> - - - escape($config->getID()); ?> - - escape($config->getTitle()); ?> - escape($config->getShellscript()); ?> - escape($config->getCreated()); ?> - + configlist as $config): ?> +
+ +
escape($config->getID()); ?>
+ +
+
+ Edit Config - Edit Config + Delete Config - - - -pagination; ?> - - + true) ?>">Delete Config +
+
escape($config->getTitle()); ?>
+
+ +
escape($config->getShellscript()); ?>
+ +
escape($config->getCreated()); ?>
+
+
+
+
+ + +pagination; ?> - - - + diff --git a/application/modules/user/views/scripts/preboot/index.phtml b/application/modules/user/views/scripts/preboot/index.phtml index f1829e1..76420fb 100644 --- a/application/modules/user/views/scripts/preboot/index.phtml +++ b/application/modules/user/views/scripts/preboot/index.phtml @@ -8,22 +8,22 @@ formButton('createpreboot', 'Create PreBoot', array( 'onclick' => 'self.location="/user/preboot/createpreboot/page/'.$this->page.'"', 'class' => 'addbutton'))?> - - - - - - - - prebootlist)==0) - echo "
ID prebootIDTitle titlePreboot Path path_prebootActions
There are no Preboot entries to display." ?> +
+
Available searchfilter:
+
prebootID
+
title
+
path_preboot
+
+ +
+ prebootlist)==0) + echo "There are no Preboot entries to display." ?> prebootlist as $preboot): ?> - - escape($preboot->getID()); ?> - escape($preboot->getTitle()); ?> - escape($preboot->getPath_preboot()); ?> - update[$preboot->getID()]==true): ?> - url( array( 'module' => 'user', 'controller' => 'preboot', @@ -32,11 +32,11 @@ 'page' => $this->page ), 'default', - true, false) ?>">Updates available - - No updates available - - Updates available + + No updates available + + Edit Preboot - Edit Preboot + Delete Preboot - + true) ?>">Delete Preboot +
+
escape($preboot->getTitle()); ?>
+
+ +
escape($preboot->getPath_preboot()); ?>
+
+ +
+ - + + pagination; ?> + + diff --git a/application/modules/user/views/scripts/session/index.phtml b/application/modules/user/views/scripts/session/index.phtml index 32c8e04..a5ed851 100644 --- a/application/modules/user/views/scripts/session/index.phtml +++ b/application/modules/user/views/scripts/session/index.phtml @@ -1,31 +1,60 @@

Session

searchform; ?> - - - - - - - - - - - - - -sessions as $session): ?> - - - - - - - - - - - - - -
ID sessionIDalphasessionID alphasessionIDClientID clientIDBootmenuentryID bootmenyentryIDBootOsID bootosIDBootIsoID bootisoIDMembershipID membershipIDTime timeIP ipIPv6 ip6
escape($session->getID()) ?>escape($session->getAlphasessionID()) ?>escape($session->getClientID()) ?>escape($session->getBootmenuentryID()) ?>escape($session->getBootosID()) ?>escape($session->getBootisoID()) ?>escape($session->getMembershipID()) ?>escape($session->getTime()) ?>escape($session->getIp()) ?>escape($session->getIp6()) ?>
+
+
Available searchfilter:
+
sessionID
+
alphasessionID
+
clientID
+
bootmenyentryID
+
bootosID
+
bootisoID
+
membershipID
+
time
+
ip
+
ip6
+
+ +
+ sessions)==0) + echo "There are no Sessions to display." ?> + sessions as $session): ?> +
+
escape($session->getID()) ?>
+
+
Alphasession escape($session->getAlphasessionID()) ?>
+
escape($session->getTime()) ?>
+
+ +
escape($session->getClientID()) ?> 
+ +
escape($session->getBootmenuentryID()) ?> 
+ +
escape($session->getBootosID()) ?> 
+ +
escape($session->getBootisoID()) ?> 
+ +
escape($session->getMembershipID()) ?> 
+ +
escape($session->getIp()) ?> 
+ +
escape($session->getIp6()) ?> 
+
+
+
+
+ +
+ pagination; ?> + + diff --git a/public/media/css/style.css b/public/media/css/style.css index 0686eae..5b6497b 100644 --- a/public/media/css/style.css +++ b/public/media/css/style.css @@ -114,6 +114,7 @@ body { font-size: 13px; min-height: 400px; background-color: #F2F3F1; + overflow:auto; } #content img { border:none; @@ -307,10 +308,13 @@ td { border: 1px solid #CCC; } -div.searchresult { +div.searchsub { margin-left:10px; font-size:10px; } +div.dsf{ + cursor:pointer; +} .updatebutton,.addbutton { float: right; diff --git a/public/media/css/user.css b/public/media/css/user.css index faf2fa4..bb959c6 100644 --- a/public/media/css/user.css +++ b/public/media/css/user.css @@ -63,4 +63,83 @@ tr.selectedEntry td { #rights-label { width: 0px; -} \ No newline at end of file +} + +/* */ +.listelement { + clear:both; + padding-top:10px; + margin:10px 0px; +} +.listelement .element { + border:1px solid black; + margin:5px 0px; + padding:5px; + -moz-border-radius: 3px; + border-radius: 3px; + background-color:white; +} +.listelement .element:hover { + background-color:#E4ECF7; + border-color:#214687; +} +.listelement .element .number{ + font-size:28px; + float:left; + padding:0px 5px 0px 0px; + width:40px; + text-align:center; + color:#CCC; + font-style:italic; + font-weight:bold; +} +.listelement .element .content{ + margin-left:50px; +} +.listelement .element .content .title{ + font-weight:bold; + font-size:1.2em; +} +.listelement .element .content .subtitle{ + font-style:italic; +} +.listelement .element .actions{ + float:right; + padding-right:5px; +} +.listelement .element .actions a{ + display:block; + line-height:14px; +} +.listelement .element .details { + margin:0px 20px 0px 10px; +} +.listelement .element .dispnone { + display:none; +} +.listelement .element .details label{ + float:left; + font-style:italic; + font-weight:bold; + width:110px; +} +.listelement .element .details div.item{ + display:block; +} +.searchvars{ + border:1px solid #000; + background-color:#FFFFBB; + display:none; + padding:6px; + clear:both; + -moz-border-radius: 3px; + border-radius: 3px; +} +.searchvars div.head{ + font-weight:bold; +} +.searchvars div.code{ + margin-left:10px; + display:inline; + color:#666; +} -- cgit v1.2.3-55-g7522