diff options
author | Simon | 2011-04-12 11:39:33 +0200 |
---|---|---|
committer | Simon | 2011-04-12 11:39:33 +0200 |
commit | b3695b8de6dff1f2047f39dbb55e015c46b045d7 (patch) | |
tree | f08ddb1425da4684fbd7e489ac79b8653a0a5453 | |
parent | Merge branch 'master' of openslx.org:lsfks/master-teamprojekt/pbs2 (diff) | |
download | pbs2-b3695b8de6dff1f2047f39dbb55e015c46b045d7.tar.gz pbs2-b3695b8de6dff1f2047f39dbb55e015c46b045d7.tar.xz pbs2-b3695b8de6dff1f2047f39dbb55e015c46b045d7.zip |
Übersicht verbessert
13 files changed, 70 insertions, 17 deletions
diff --git a/application/modules/user/views/scripts/bootiso/index.phtml b/application/modules/user/views/scripts/bootiso/index.phtml index d0e8dd1..a8c4e1c 100644 --- a/application/modules/user/views/scripts/bootiso/index.phtml +++ b/application/modules/user/views/scripts/bootiso/index.phtml @@ -28,7 +28,10 @@ echo "There are no BootISO entries to display." ?> <?php foreach ($this->bootisolist as $k => $bootiso): ?> <div class='element'> - <div class='number'><?php echo $k+1; ?></div> + <div class='number'> + <div class='smallnumber'>BootIso</div> + <?php echo $k+1; ?> + </div> <div class='content'> <div class='actions'> <?php if(Pbs_Acl::checkRight('bdld')): ?> diff --git a/application/modules/user/views/scripts/bootmenu/index.phtml b/application/modules/user/views/scripts/bootmenu/index.phtml index cda6f87..332a1a4 100644 --- a/application/modules/user/views/scripts/bootmenu/index.phtml +++ b/application/modules/user/views/scripts/bootmenu/index.phtml @@ -36,7 +36,10 @@ $class= 'highlight'; ?> <div class='element<?php echo " $class";?>'> - <div class='number'><?php echo $k+1 ?></div> + <div class='number'> + <div class='smallnumber'>BMenu</div> + <?php echo $k+1 ?> + </div> <div class='content'> <div class='actions'> <?php if(Pbs_Acl::checkRight('boodbm') && $this->type == 'group'): ?> @@ -107,7 +110,10 @@ <?php endif; ?> <?php foreach ($this->bootmenuentrylist[$bootmenu->getID()] as $k => $bootmenuentry): ?> <div class='element'> - <div class='number'><?php echo $k+1 ?></div> + <div class='number'> + <div class='smallnumber'>BMEntry</div> + <?php echo $k+1 ?> + </div> <div class='content'> <div class='actions'> <?php if((Pbs_Acl::checkRight('booai') && $this->type == 'group') || (Pbs_Acl::checkRight('booaio') && $this->type == 'own')): ?> diff --git a/application/modules/user/views/scripts/bootos/index.phtml b/application/modules/user/views/scripts/bootos/index.phtml index d135ed3..00a0eb8 100644 --- a/application/modules/user/views/scripts/bootos/index.phtml +++ b/application/modules/user/views/scripts/bootos/index.phtml @@ -36,7 +36,10 @@ echo "There are no BootOs's to display." ?> <?php foreach ($this->bootoslist as $k => $bootos): ?> <div class='element'> - <div class='number'><?php echo $k+1 ?></div> + <div class='number'> + <div class='smallnumber'>BootOs</div> + <?php echo $k+1 ?> + </div> <div class='content'> <div class='actions'> <?php if(Pbs_Acl::checkRight('bou')): ?> diff --git a/application/modules/user/views/scripts/client/index.phtml b/application/modules/user/views/scripts/client/index.phtml index 0d6145c..15918cc 100644 --- a/application/modules/user/views/scripts/client/index.phtml +++ b/application/modules/user/views/scripts/client/index.phtml @@ -18,7 +18,9 @@ echo "There are no Clients to display." ?> <?php foreach ($this->clients as $client): ?> <div class='element'> - <div class='number'><?php echo $this->escape($client['clientID']) ?></div> + <div class='number'> + <div class='smallnumber'>Client</div> + <?php echo $this->escape($client['clientID']) ?></div> <div class='content'> <div class='actions'> <?php if(Pbs_Acl::checkRight('cle')): ?> diff --git a/application/modules/user/views/scripts/config/index.phtml b/application/modules/user/views/scripts/config/index.phtml index 7966a3e..40a9715 100644 --- a/application/modules/user/views/scripts/config/index.phtml +++ b/application/modules/user/views/scripts/config/index.phtml @@ -31,7 +31,10 @@ echo "There are no Config's to display." ?> <?php foreach ($this->configlist as $k => $config): ?> <div class='element'> - <div class='number'><?php echo $k+1; ?></div> + <div class='number'> + <div class='smallnumber'>Config</div> + <?php echo $k+1; ?> + </div> <div class='content'> <div class='actions'> <?php if(((Pbs_Acl::checkRight('ce') || Pbs_Acl::checkRight('cem')) && $this->type == 'group') || ($this->type == 'own' && Pbs_Acl::checkRight('ceo'))): ?> diff --git a/application/modules/user/views/scripts/filter/index.phtml b/application/modules/user/views/scripts/filter/index.phtml index a242a7b..bb11da7 100644 --- a/application/modules/user/views/scripts/filter/index.phtml +++ b/application/modules/user/views/scripts/filter/index.phtml @@ -22,7 +22,9 @@ echo "There are no Filters to display." ?> <?php foreach ($this->filters as $filter): ?> <div class='element'> - <div class='number'><acronym title='<?php echo $this->escape($filter->getID()) ?>'><?php echo $this->escape($filter->priority) ?></acronym></div> + <div class='number'> + <div class='smallnumber'>Priority</div> + <acronym title='<?php echo $this->escape($filter->getID()) ?>'><?php echo $this->escape($filter->priority) ?></acronym></div> <div class='content'> <div class='actions'> <?php if(Pbs_Acl::checkRight('fe') || Pbs_Acl::checkRight('fefp')):?> diff --git a/application/modules/user/views/scripts/group/showall.phtml b/application/modules/user/views/scripts/group/showall.phtml index 5e53f87..2e376b3 100644 --- a/application/modules/user/views/scripts/group/showall.phtml +++ b/application/modules/user/views/scripts/group/showall.phtml @@ -21,7 +21,10 @@ $class= 'highlight checked'; ?> <div class='element<?php echo " $class";?>'><?php if($group->getID() != $this->userIDsNamespace['groupID']) { ?> -<div class='number'><?php echo $k+1; ?></div> +<div class='number'> + <div class='smallnumber'>Group</div> + <?php echo $k+1; ?> +</div> <?php } ?> diff --git a/application/modules/user/views/scripts/person/showall.phtml b/application/modules/user/views/scripts/person/showall.phtml index 1521744..1909782 100644 --- a/application/modules/user/views/scripts/person/showall.phtml +++ b/application/modules/user/views/scripts/person/showall.phtml @@ -18,7 +18,10 @@ $class= 'highlight checked'; <div class='element<?php echo " $class";?>'> <?php if($person->getID() != $this->userIDsNamespace['personID']) { ?> - <div class='number'><?php echo $k+1; ?></div> + <div class='number'> + <div class='smallnumber'>Person</div> + <?php echo $k+1; ?> + </div> <?php } ?> diff --git a/application/modules/user/views/scripts/pool/index.phtml b/application/modules/user/views/scripts/pool/index.phtml index fbdb8f8..49ad5f7 100644 --- a/application/modules/user/views/scripts/pool/index.phtml +++ b/application/modules/user/views/scripts/pool/index.phtml @@ -26,7 +26,10 @@ echo "There are no Pools to display." ?> <?php foreach ($this->pools as $pool): ?> <div class='element'> - <div class='number'><?php echo $this->escape($pool->getID()) ?></div> + <div class='number'> + <div class='smallnumber'>Pool</div> + <?php echo $this->escape($pool->getID()) ?> + </div> <div class='content'> <div class='actions'> <?php if(Pbs_Acl::checkRight('poe')): ?> @@ -84,7 +87,10 @@ $clientMapper->find($client['clientID'],$cli); ?> <div class='element'> - <div class='number'><?php echo $client['clientID'];?></div> + <div class='number'> + <div class='smallnumber'>Client</div> + <?php echo $client['clientID'];?> + </div> <div class='content'> <div class='actions'> <?php if(Pbs_Acl::checkRight('pouc')):?> @@ -132,7 +138,9 @@ <?php foreach ($this->freeclients as $client): ?> <div class='element'> - <div class='number'>5</div> + <div class='number'> + <div class='smallnumber'>Client</div> + <?php echo $client['clientID'];?></div> <div class='content'> <div class='actions'> <?php if(Pbs_Acl::checkRight('polc')):?> diff --git a/application/modules/user/views/scripts/preboot/index.phtml b/application/modules/user/views/scripts/preboot/index.phtml index dba956c..dd9faba 100644 --- a/application/modules/user/views/scripts/preboot/index.phtml +++ b/application/modules/user/views/scripts/preboot/index.phtml @@ -25,7 +25,10 @@ echo "There are no Preboot entries to display." ?> <?php foreach ($this->prebootlist as $k => $preboot): ?> <div class='element'> - <div class='number'><?php echo $k+1 ?></div> + <div class='number'> + <div class='smallnumber'>Preboot</div> + <?php echo $k+1 ?> + </div> <div class='content'> <div class='actions'> <?php if(Pbs_Acl::checkRight('pru')): ?> diff --git a/application/modules/user/views/scripts/role/index.phtml b/application/modules/user/views/scripts/role/index.phtml index cc34869..0488211 100644 --- a/application/modules/user/views/scripts/role/index.phtml +++ b/application/modules/user/views/scripts/role/index.phtml @@ -24,7 +24,10 @@ $class= 'highlight checked'; ?> <div class='element<?php echo " $class";?>'><?php if($role['roleID'] != $this->userIDsNamespace['roleID']) { ?> -<div class='number'><?php echo $k+1; ?></div> +<div class='number'> + <div class='smallnumber'>Role</div> + <?php echo $k+1; ?> +</div> <?php } ?> diff --git a/application/modules/user/views/scripts/session/index.phtml b/application/modules/user/views/scripts/session/index.phtml index c4225f3..67c8b8d 100644 --- a/application/modules/user/views/scripts/session/index.phtml +++ b/application/modules/user/views/scripts/session/index.phtml @@ -19,7 +19,10 @@ echo "There are no Sessions to display." ?> <?php foreach ($this->sessions as $session): ?> <div class='element'> - <div class='number'><?php echo $this->escape($session->getID()) ?></div> + <div class='number'> + <div class='smallnumber'>Session</div> + <?php echo $this->escape($session->getID()) ?> + </div> <div class='content'> <div class='title'>Alphasession <?php echo $this->escape($session->getAlphasessionID()) ?></div> <div class='subtitle'><?php echo $this->escape($session->getTime()) ?></div> diff --git a/public/media/css/user.css b/public/media/css/user.css index 19d86cd..8b16f52 100644 --- a/public/media/css/user.css +++ b/public/media/css/user.css @@ -84,6 +84,7 @@ .listelement .element .number { font-size: 28px; + clear:left; float: left; padding: 0px 5px 0px 0px; width: 40px; @@ -91,8 +92,18 @@ color: #CCC; font-style: italic; font-weight: bold; + line-height:26px; +} +.listelement .element .smallnumber{ + font-size: 10px; + float: left; + padding: 0px 5px 0px 0px; + width: 40px; + text-align: center; + color: #CCC; + font-weight: bold; + line-height:12px; } - .listelement .element .content { margin-left: 50px; } @@ -199,4 +210,4 @@ .noBold { font-weight: normal; -}
\ No newline at end of file +} |