yolinlin/aowow
1
0
Fork 0
mirror of https://github.com/Sarjuuk/aowow.git synced 2025-11-29 15:58:16 +08:00
Code Issues Packages Projects Releases Wiki Activity

- check for url-param 'locale' and handle as temporary choice

Browse Source 
- spell: added effect: killCredit2 to parsed list
- fixed some mixups, when eventId was used instead of holidayId and vice versa
- avoid zero values for page Types so there are no longer empty tooltips on the language-menu
- rewrote conditions system:
  * table: conditions is now in use (needs some more cases to check for)
  * adapted existing 'conditions', may need some wording fixes
  * can now calso reate a single listview tab for more detailed information
  * this is not localized for frFR, esES or ruRU
- enabled support for non-tamplate tabs (leave 'file' empty and 'data' is used as HTML)
This commit is contained in:
Sarjuuk
2014-09-23 18:48:07 +02:00
parent 813b3600ce
commit ad3f826906
26 changed files with 1156 additions and 384 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
pages/event.php
View File

@@ -226,14 +226,8 @@ class EventPage extends GenericPage
$relEvents = new WorldEventList(array(['id', $list]));
$this->extendGlobalData($relEvents->getJSGlobals());
$relData = $relEvents->getListviewData();
foreach ($relEvents->iterate() as $id => $__)
{
$relData[$id]['condition'][] = array(
'type' => TYPE_WORLDEVENT,
'typeId' => -$this->eId,
'status' => 2
);
}
foreach ($relEvents->getFoundIDs() as $id)
$relData[$id]['condition'][0][$this->typeId][] = [[-CND_ACTIVE_EVENT, -$this->eId]];
$this->extendGlobalData($this->subject->getJSGlobals());
foreach ($rel as $r)
@@ -241,14 +235,10 @@ class EventPage extends GenericPage
if ($r >= 0)
continue;
$this->extendGlobalIds(TYPE_WORLDEVENT, -$r);
$this->extendGlobalIds(TYPE_WORLDEVENT, $r);
$d = $this->subject->getListviewData();
$d[-$this->eId]['condition'][] = array(
'type' => TYPE_WORLDEVENT,
'typeId' => $r,
'status' => 2
);
$d[-$this->eId]['condition'][0][$this->typeId][] = [[-CND_ACTIVE_EVENT, $r]];
$relData = array_merge($relData, $d);
}