diff --git a/views/html/charactergroups/group.tpl b/views/html/charactergroups/group.tpl
index ba53c97b..0f6f88d3 100644
--- a/views/html/charactergroups/group.tpl
+++ b/views/html/charactergroups/group.tpl
@@ -3,23 +3,21 @@
-
-
-
-
-
-

-
-
-
=$group['name']?>
- =$group['motto']?>
-
-
- - =$group['rank']?>. =_('Rank')?>
- - =$group['xps']?> XPs
- - =count($group['characters'])?> =(count($group['characters']) > 1) ? _('Members') : _('Member')?>
-
-
+
+
+

+
=$group['name']?>
+
"=$group['motto']?>"
+
+
+ - =$group['rank']?>. =_('Rank')?>
+ - =$group['xps']?> XP
+ - =count($group['characters'])?> =(count($group['characters']) > 1) ? _('Members') : _('Member')?>
+
=_('Characters')?>
diff --git a/views/html/charactergroups/groupsgroup.tpl b/views/html/charactergroups/groupsgroup.tpl
index 93aeaba7..3d337cf3 100644
--- a/views/html/charactergroups/groupsgroup.tpl
+++ b/views/html/charactergroups/groupsgroup.tpl
@@ -3,19 +3,22 @@
-
-
-=$groupsgroup['name']?>
-
-
-
- - =$group['name']?> (=$group['xps']?> XPs)
-
+
+=$groupsgroup['name']?>
-=_('Character Groups Quests')?>
-
+
+
+ - =$group['name']?>=$group['xps']?> XP
+
+
+
+
+=_('Character Groups Quests')?>
+
- =$quest['title']?>
diff --git a/views/html/charactergroups/index.tpl b/views/html/charactergroups/index.tpl
index e0f54b94..d88d25eb 100644
--- a/views/html/charactergroups/index.tpl
+++ b/views/html/charactergroups/index.tpl
@@ -3,10 +3,11 @@
-
-=_('Character Groups')?>
-
-
+
+=_('Character Groups')?>
+
- =$group['name']?>
diff --git a/views/html/charactergroupsquests/quest.tpl b/views/html/charactergroupsquests/quest.tpl
index 8112a913..060cf3ab 100644
--- a/views/html/charactergroupsquests/quest.tpl
+++ b/views/html/charactergroupsquests/quest.tpl
@@ -3,19 +3,23 @@
-
-=_('Character Groups Quests')?>
-
-=$quest['title']?>
+
-
-
-
+=$quest['title']?>
+Maximale Belohnung: =$quest['xps']?> XP
- XPs: =$quest['xps']?>
=_('Description')?>
- =\hhu\z\Utils::t($quest['description'])?>
+
+
+
+
+ =\hhu\z\Utils::t($quest['description'])?>
+
=_('Rules')?>
=\hhu\z\Utils::t($quest['rules'])?>
@@ -37,15 +41,13 @@
=$groupsgroup['name']?>
-
-
-
-
- | =$dateFormatter->format(new \DateTime($group['created']))?> |
- =$group['name']?> |
- =$group['xps']?>/=$quest['xps']?> XPs |
-
-
-
-
+
+
+ -
+ =$dateFormatter->format(new \DateTime($group['created']))?>
+ =$group['name']?>
+ =$group['xps']?> XP
+
+
+
diff --git a/www/css/desktop.css b/www/css/desktop.css
index cfff8097..fa06d795 100644
--- a/www/css/desktop.css
+++ b/www/css/desktop.css
@@ -113,7 +113,7 @@ aside{display:none}
#qtextbox{font-size:.875em;border-radius:5px;background:#fff;border:15px solid #fff;height:200px;overflow:hidden}
.qtext{padding-right:15px}
-.qtext img{float:right;margin-left:15px;max-width:30%;border-radius:3px}
+.qtext img,.grpqimg{float:right;margin-left:15px;max-width:30%;border-radius:3px}
.xpinfo{display:none}
.xpbar{width:60%;float:left;height:10px;position:relative;background:#eee;border-radius:25px;margin:8px 0 16px}
@@ -163,12 +163,19 @@ input[type="submit"][disabled]{text-shadow:1px 2px #d48c4e;background:#f9ac69;bo
.ctopics .xpbar span{background:#50a4ab}
+/** Charactergroup List **/
+
+.cglist li{list-style-type:decimal;background:#fff;margin:0 0 6px 25px;padding:5px 15px;border-radius:3px}
+.cglist .xp{float:right}
+.cgqlist li{list-style-type:square;margin-left:25px;padding:2px 15px}
+
/** Charactergroup Profile **/
-.gdata{margin-top:20px}
-.gdata img{border-radius:3px;margin-bottom:15px}
-.gdata h1{margin:0;padding:0}
-.gdata .fa{color:#aca8a1}
+.gbanner img{margin-top:10px;border-radius:3px}
+.gbanner h1{margin:10px 0 5px 0}
+
+.gdata{margin:20px 0 40px 0}
+.gdata li{float:left;background:#fff;padding:5px 15px;margin:0 5px 5px 0;border-radius:3px}
.gchars li{background:#fff;padding:15px 0;border-radius:3px;float:left;margin-bottom:5px;width:49%}
.gchars li:nth-child(even){float:right}
@@ -182,6 +189,14 @@ input[type="submit"][disabled]{text-shadow:1px 2px #d48c4e;background:#f9ac69;bo
.gquests .xp{display:block}
+/** Charactergroup Quest **/
+
+.grpqlist li{background:#fff;margin-bottom:6px;padding:5px 15px 5px 0;font-size:.875em;border-radius:3px}
+.grpqlist .date{padding:0 15px;border-right:1px solid #dad8d5}
+.grpqlist .group{padding:0 15px}
+.grpqlist .xp{float:right}
+
+
/** Achievements **/
.rare ol{margin-bottom:40px}
@@ -228,9 +243,9 @@ input[type="submit"][disabled]{text-shadow:1px 2px #d48c4e;background:#f9ac69;bo
.cinfo{float:left;width:70%}
.cportrait{float:right;width:25%}
-.gdata .gbanner{float:left;min-width:100px}
-.gdata .gdesc{float:left;width:75%}
-.gdata ul{clear:both}
+.gbanner img{float:left;margin:20px 20px 0 0}
+.gbanner h1{margin:25px 0 2px}
+
.gchars li{width:32%;margin-right:5px}
.gchars li:nth-child(even){float:left}
@@ -242,10 +257,6 @@ input[type="submit"][disabled]{text-shadow:1px 2px #d48c4e;background:#f9ac69;bo
@media only screen and (min-width:768px){
.xpbar{width:70%}
-.gdata{margin-top:40px}
-.gdata .gdesc{width:60%}
-.gdata li{font-size:.875em;padding-bottom:5px}
-.gdata ul{clear:none;float:right;width:20%;margin:0;padding:0}
.gchars li{width:19%}
.gquests .date{display:inline;margin-right:15px}