coderkun/questlab
1
0
Fork 0
Code Issues 15 Pull requests Projects Releases Wiki Activity

merge

Browse source
This commit is contained in:
coderkun 2014-04-25 02:45:42 +02:00
commit 5a6b53d222
6 changed files with 31 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

BIN
locale/de_DE/LC_MESSAGES/The Legend of Z.mo
View file

Binary file not shown.

30
locale/de_DE/LC_MESSAGES/The Legend of Z.po
View file

@ -1,8 +1,8 @@
msgid ""
msgstr ""
"Project-Id-Version: The Legend of Z\n"
"POT-Creation-Date: 2014-04-24 18:05+0100\n"
"PO-Revision-Date: 2014-04-24 18:06+0100\n"
"POT-Creation-Date: 2014-04-25 02:24+0100\n"
"PO-Revision-Date: 2014-04-25 02:26+0100\n"
"Last-Translator: \n"
"Language-Team: \n"
"Language: de_DE\n"
@ -121,7 +121,7 @@ msgstr "Fehler"
#: views/html/achievements/index.tpl:9 views/html/seminarymenu/index.tpl:4
msgid "Achievements"
msgstr "Errungenschaften"
msgstr "Achievements"
#: views/html/achievements/index.tpl:10
msgid "Achievement description"
@ -215,16 +215,11 @@ msgid "Characters"
msgstr "Charaktere"
#: views/html/charactergroups/group.tpl:45
#: views/html/charactergroups/managegroup.tpl:54
#: views/html/questgroups/questgroup.tpl:57 views/html/quests/create.tpl:9
#: views/html/quests/index.tpl:9
msgid "Quests"
msgstr "Quests"
#: views/html/charactergroups/groupsgroup.tpl:20
#: views/html/charactergroupsquests/quest.tpl:9
msgid "Character Groups Quests"
msgstr "Gruppenquests"
#, php-format
msgid "%s-Quests"
msgstr "%squests"
#: views/html/charactergroups/managegroup.tpl:40
msgid "Remove Characters"
@ -238,6 +233,12 @@ msgstr "Filtere Charaktere"
msgid "Add Characters"
msgstr "Füge Charaktere hinzu"
#: views/html/charactergroups/managegroup.tpl:54
#: views/html/questgroups/questgroup.tpl:57 views/html/quests/create.tpl:9
#: views/html/quests/index.tpl:9
msgid "Quests"
msgstr "Quests"
#: views/html/charactergroupsquests/quest.tpl:16
msgid "Description"
msgstr "Beschreibung"
@ -743,6 +744,13 @@ msgstr "Registrieren"
msgid "Roles"
msgstr "Rollen"
#, fuzzy
#~ msgid "%stQuests"
#~ msgstr "Quests"
#~ msgid "Character Groups Quests"
#~ msgstr "Gruppenquests"
#~ msgid "Skip task"
#~ msgstr "Aufgabe überspringen"

15
models/CharactersModel.inc
View file

@ -186,15 +186,18 @@
return $this->db->query(
'SELECT characters.id, characters.created, characters.charactertype_id, characters.name, characters.url, characters.user_id, characters.xps, characters.xplevel, characters.avatar_id, charactertypes.name AS charactertype_name, charactertypes.url AS charactertype_url, count(DISTINCT achievement_id) AS c '.
'FROM achievements_characters '.
'LEFT JOIN achievements ON achievements.id = achievements_characters.achievement_id '.
'LEFT JOIN v_characters AS characters ON characters.id = achievements_characters.character_id '.
'LEFT JOIN charactertypes ON charactertypes.id = characters.charactertype_id '.
'INNER JOIN achievements ON achievements.id = achievements_characters.achievement_id '.
'INNER JOIN v_characters AS characters ON characters.id = achievements_characters.character_id '.
'INNER JOIN characters_characterroles ON characters_characterroles.character_id = characters.id '.
'INNER JOIN characterroles ON characterroles.id = characters_characterroles.characterrole_id AND characterroles.name = ? '.
'INNER JOIN charactertypes ON charactertypes.id = characters.charactertype_id '.
'WHERE achievements.seminary_id = ? AND deadline IS NULL '.
(!$alsoWithDeadline ? 'AND achievements.deadline IS NULL ' : null).
'GROUP BY character_id '.
'ORDER BY count(DISTINCT achievement_id) DESC '.
'GROUP BY achievements_characters.character_id '.
'ORDER BY count(DISTINCT achievements_characters.achievement_id) DESC '.
'LIMIT ?',
'ii',
'sii',
'user',
$seminaryId,
$count
);

2
views/html/charactergroups/group.tpl
View file

@ -42,7 +42,7 @@
</section>
<section>
<h1><i class="fa fa-pencil-square-o fa-fw"></i><?=_('Quests')?></h1>
<h1><i class="fa fa-pencil-square-o fa-fw"></i><?=sprintf(_('%s-Quests'),$groupsgroup['name'])?></h1>
<ul class="gquests">
<?php foreach($quests as &$quest) : ?>
<li class="cf">

2
views/html/charactergroups/groupsgroup.tpl
View file

@ -17,7 +17,7 @@
</ol>
<h2><?=_('Character Groups Quests')?></h2>
<h2><?=sprintf(_('%s-Quests'),$groupsgroup['name'])?></h2>
<ul class="cgqlist">
<?php foreach($quests as &$quest) : ?>
<li><a href="<?=$linker->link(array('charactergroupsquests','quest',$seminary['url'],$groupsgroup['url'],$quest['url']))?>"><?=$quest['title']?></a></li>

2
views/html/charactergroupsquests/quest.tpl
View file

@ -5,8 +5,8 @@
<?php endif ?>
<ul class="breadcrumbs">
<li><a href="<?=$linker->link(array('seminaries',$seminary['url']))?>"><?=$seminary['title']?></a></li>
<li><i class="fa fa-chevron-right fa-fw"></i><a href="<?=$linker->link(array('charactergroups','index',$seminary['url']))?>"><?=_('Character Groups')?></a></li>
<li><i class="fa fa-chevron-right fa-fw"></i><a href="<?=$linker->link(array('charactergroups','groupsgroup',$seminary['url'],$groupsgroup['url']))?>"><?=$groupsgroup['name']?></a></li>
<li><i class="fa fa-chevron-right fa-fw"></i><?=_('Character Groups Quests')?></li>
</ul>
<h1><?=$quest['title']?></h1>