[Scummvm-git-logs] scummvm-web master -> 6c973b34b785b29c5ee7e94a53b463fd90df6147

Mataniko mataniko at gmail.com
Thu Oct 1 04:49:07 UTC 2020


This automated email contains information about 1 new commit which have been
pushed to the 'scummvm-web' repo located at https://github.com/scummvm/scummvm-web .

Summary:
6c973b34b7 WEB: Move Subprojects to Downloads page


Commit: 6c973b34b785b29c5ee7e94a53b463fd90df6147
    https://github.com/scummvm/scummvm-web/commit/6c973b34b785b29c5ee7e94a53b463fd90df6147
Author: Mataniko (mataniko at gmail.com)
Date: 2020-10-01T00:48:59-04:00

Commit Message:
WEB: Move Subprojects to Downloads page

Changed paths:
  R data/subprojects.xml
  R include/Models/SubprojectsModel.php
  R include/Objects/Subproject.php
  R include/Pages/SubprojectsPage.php
  R templates/pages/subprojects.tpl
    data/downloads.xml
    data/localization/de/strings.json
    data/localization/el/strings.json
    data/localization/en/strings.json
    data/localization/es/strings.json
    data/localization/fr/strings.json
    data/localization/he/strings.json
    data/localization/it/strings.json
    data/localization/pl/strings.json
    data/localization/pt-BR/strings.json
    data/localization/pt-PT/strings.json
    data/localization/ru/strings.json
    data/menus.yaml
    public_html/index.php


diff --git a/data/downloads.xml b/data/downloads.xml
index ed241647..8022ce1f 100644
--- a/data/downloads.xml
+++ b/data/downloads.xml
@@ -955,6 +955,20 @@
 				</link>
 			</entries>
 		</subsection>
+		<subsection>
+			<title>{#downloadsSubprojects#}</title>
+			<entries>
+				<link>
+					<name>ScummEx</name>
+					<url>/frs/extras/ScummEx/scummex-win32.exe</url>
+					<description>: ScummEx is a multi-platform SCUMM resource browser, viewer and extractor using the wxWindows toolkit.
+						<h:p>
+							Development on this project is currently stalled. The code-base needs quite some cleanup, and viewers for many resource types still need adding to the code. Patches and volunteers are very welcome...
+						</h:p>
+					</description>
+				</link>
+			</entries>
+		</subsection>
 	</section>
 
 	<section>
diff --git a/data/localization/de/strings.json b/data/localization/de/strings.json
index 7dfc6a06..eec7d391 100644
--- a/data/localization/de/strings.json
+++ b/data/localization/de/strings.json
@@ -163,10 +163,6 @@
     "screenshotsViewerPrevious": "Vorheriges",
     "screenshotsViewerNext": "Nächstes",
     "screenshotsViewerBack": "Zurück",
-    "subprojectsTitle": "Unterprojekte",
-    "subprojectsContentTitle": "Unterprojekte",
-    "subprojectsIntroP1": "Gelegentlich arbeitet das ScummVM-Team an verschiedenen Unterprojekten, die nicht direkt etwas mit ScummVM selbst zu tun haben. Diese Projekte stagnieren häufig und genießen keine besonders hohe Priorität. Trotzdem soll diese Seite über diese Projekte informieren, in der vagen Hoffnung, weitere Entwickler für diese Nebenprojekte zu gewinnen.",
-    "subprojectsIntroP2": "Bitte fragen Sie nicht danach, wo Sie die Binärdateien für diese Programme beziehen können. Beide Nebenprojekte sind derzeit nur für Entwickler geeignet... Wenn Sie den Code nicht selbst kompilieren können, dann sind diese Programme nicht wirklich für Sie geeignet.",
     "cookieText": "Wir setzen Cookies ein, um den Inhalt der Website zu verbessern und Informationen über die Leistung und Verwendung der Website zu sammeln.",
     "cookieAccept": "Cookies erlauben",
     "cookieDecline": "Cookies ablehnen",
@@ -191,7 +187,6 @@
     "menuDevelopmentSourceCode": "Quellcode-Verzeichnis",
     "menuDevelopmentBuildbot": "Buildbot",
     "menuHeaderMisc": "Verschiedenes",
-    "menuMiscSubprojects": "Unterprojekte",
     "menuMiscDemos": "Demos",
     "menuMiscPress": "Pressespiegel",
     "menuMiscContact": "Kontakt",
diff --git a/data/localization/el/strings.json b/data/localization/el/strings.json
index c3880b0a..efd882be 100644
--- a/data/localization/el/strings.json
+++ b/data/localization/el/strings.json
@@ -170,10 +170,6 @@
     "screenshotsViewerPrevious": "Προηγούμενο",
     "screenshotsViewerNext": "Επόμενο",
     "screenshotsViewerBack": "Πίσω",
-    "subprojectsTitle": "Επιμέρους projects",
-    "subprojectsContentTitle": "Επιμέρους projects",
-    "subprojectsIntroP1": "Η ομάδα του ScummVM κατά περιόδους δουλεύει πάνω σε διάφορα επιμέρους projects, ξεχωριστά από το κεντρικό πρόγραμμα του ScummVM. Αυτά τα projects είναι γενικά τον περισσότερο καιρό αρκετά στάσιμα και δεν τους δίνεται υψηλή προτεραιότητα. Σε κάθε περίπτωση, αυτή η σελίδα βρίσκεται εδώ για να σας ενημερώσει για την ύπαρξή τους, με την αόριστη ελπίδα να προσελκύσει περισσότερους προγραμματιστές που θα βοηθήσουν στην ανάπτυξη και συντήρηση αυτών των παράπλευρων προγραμμάτων.",
-    "subprojectsIntroP2": "Παρακαλούμε, μη ρωτάτε πού μπορείτε να αποκτήσετε εκτελέσιμα πακέτα για αυτά τα προγράμματα. Για την ώρα και τα δύο επιμέρους projects βρίσκονται ακόμα σε κατάσταση που μόνο προγραμματιστές μπορούν να τα χρησιμοποιήσουν... συνεπώς αν δεν μπορείτε να μεταγλωττίσετε τον κώδικα οι ίδιοι, τότε αυτά δεν είναι έτοιμα ακόμα για σας να τα χρησιμοποιήσετε.",
     "cookieText": "Χρησιμοποιούμε cookies για να βελτιώσουμε το περιεχόμενο και να αναλύσουμε πληροφορία σχετικά με τις επιδόσεις του ιστοτόπου και την χρήση του.",
     "cookieAccept": "Αποδοχή Cookies",
     "cookieDecline": "Απόρριψη Cookies",
@@ -198,7 +194,6 @@
     "menuDevelopmentSourceCode": "Δένδρο Πηγαίου Κώδικα",
     "menuDevelopmentBuildbot": "Buildbot",
     "menuHeaderMisc": "Διάφορα",
-    "menuMiscSubprojects": "Επιμέρους Projects",
     "menuMiscDemos": "Demos",
     "menuMiscPress": "Άρθρα στον Τύπο",
     "menuMiscContact": "Επικοινωνία",
diff --git a/data/localization/en/strings.json b/data/localization/en/strings.json
index 132497a3..0bd76854 100644
--- a/data/localization/en/strings.json
+++ b/data/localization/en/strings.json
@@ -91,8 +91,9 @@
   "downloadsOldBinariesFrsNote1": "You can also ",
   "downloadsOldBinariesFrsNote2": "browse our server",
   "downloadsOldBinariesFrsNote3": " to find all the past releases.",
-  "downloadsExtra": "Extras, game downloads",
+  "downloadsExtra": "Extras, game downloads, subprojects",
   "downloadsGames": "Game downloads",
+  "downloadsSubprojects": "Subprojects",
   "downloadsDailyBuilds": "Daily Builds",
   "downloadsDailyNote1": "WARNING:",
   "downloadsDailyNote2": "The following builds are bleeding edge development versions made directly from our source repository. That means that they received no proper testing (usually no testing at all) and that any number of things may be broken in them. For example, they might corrupt your config file, crash frequently or might not even start. Use them at your own risk!",
@@ -183,10 +184,6 @@
   "sponsorsContentTitle": "Sponsors",
   "sponsorsHeading": "ScummVM Sponsors",
   "sponsorsIntro": "The following companies have graciously provided their assistance to the ScummVM project",
-  "subprojectsTitle": "Subprojects",
-  "subprojectsContentTitle": "Subprojects",
-  "subprojectsIntroP1": "The ScummVM team occasionally works on various subprojects, separate from the main ScummVM program. These projects are generally reasonably stagnant and not given a high priority. Regardless, this page is here to inform you of them, in the vague hope of attracting more developers to help maintain these side-programs.",
-  "subprojectsIntroP2": "Please do not ask where you can obtain binaries of these programs. Currently both subprojects are still in a state only suitable for developers... so if you can't compile the code yourself, then these are not really ready for you.",
   "cookieText": "We use cookies to enhance content and analyze information on site performance and usage.",
   "cookieAccept": "Allow Cookies",
   "cookieDecline": "Refuse Cookies",
@@ -212,7 +209,6 @@
   "menuDevelopmentBuildbot": "Buildbot",
   "menuHeaderMisc": "Misc. Menu",
   "menuMiscSponsors": "Sponsors",
-  "menuMiscSubprojects": "Subprojects",
   "menuMiscDemos": "Demos",
   "menuMiscPress": "Press Coverage",
   "menuMiscContact": "Contact",
diff --git a/data/localization/es/strings.json b/data/localization/es/strings.json
index 62a40318..21569d45 100644
--- a/data/localization/es/strings.json
+++ b/data/localization/es/strings.json
@@ -168,10 +168,6 @@
     "screenshotsViewerPrevious": "Anterior",
     "screenshotsViewerNext": "Siguiente",
     "screenshotsViewerBack": "Volver",
-    "subprojectsTitle": "Subproyectos",
-    "subprojectsContentTitle": "Subproyectos",
-    "subprojectsIntroP1": "Ocasionalmente, el equipo de ScummVM trabaja en varios subproyectos separados del programa principal de ScummVM. Por lo general, estos proyectos están relativamente estancados y no se les da mucha prioridad. Sin embargo, esta página está aquí para informarte de ellos, con la ligera esperanza de atraer más desarrolladores que nos ayuden a mantener estos proyectos paralelos.",
-    "subprojectsIntroP2": "Por favor, no preguntes dónde obtener los binarios de estos programas. Actualmente ambos subproyectos se encuentran en un estado solo apto para desarrolladores... así que si no puedes compilar el código por ti mismo, es que no están realmente preparados para ti.",
     "cookieText": "Utilizamos cookies para mejorar los contenidos y analizar información de rendimiento y uso de este sitio.",
     "cookieAccept": "Permitir cookies",
     "cookieDecline": "Rechazar cookies",
@@ -196,7 +192,6 @@
     "menuDevelopmentSourceCode": "Código fuente",
     "menuDevelopmentBuildbot": "Buildbot",
     "menuHeaderMisc": "Miscelánea",
-    "menuMiscSubprojects": "Subproyectos",
     "menuMiscDemos": "Demos",
     "menuMiscPress": "Cobertura en prensa",
     "menuMiscContact": "Contacto",
diff --git a/data/localization/fr/strings.json b/data/localization/fr/strings.json
index f4c65b7a..578af775 100644
--- a/data/localization/fr/strings.json
+++ b/data/localization/fr/strings.json
@@ -164,10 +164,6 @@
     "screenshotsViewerPrevious": "Précédent",
     "screenshotsViewerNext": "Suivant",
     "screenshotsViewerBack": "Retour",
-    "subprojectsTitle": "Sous-projets",
-    "subprojectsContentTitle": "Sous-projets",
-    "subprojectsIntroP1": "L'équipe de ScummVM travaille occasionnellement sur des projets dérivés, distincts du logiciel ScummVM. Ces projets sont en règle générale de plus basse priorité et ont une faible activité. Cette page est là pour vous informer sur ces projets, avec le vague espoir d'attirer plus de développeurs pour aider à les maintenir.",
-    "subprojectsIntroP2": "Veuillez ne pas nous demander où obtenir des exécutables pour ces logiciels. Actuellement, ces sous-projets sont dans un état qui les rend utilisables uniquement par des développeurs... donc si vous ne pouvez pas compiler le code vous-même, ils ne sont pas vraiment faits pour vous.",
     "cookieText": "Nous utilisons les cookies pour améliorer le contenu et analyser les informations sur la performance et l'utilisation du site.",
     "cookieAccept": "Accepter les Cookies",
     "cookieDecline": "Refuser les cookies",
@@ -192,7 +188,6 @@
     "menuDevelopmentSourceCode": "Code source",
     "menuDevelopmentBuildbot": "Buildbot",
     "menuHeaderMisc": "Menu Divers",
-    "menuMiscSubprojects": "Sous-projets",
     "menuMiscDemos": "Démos",
     "menuMiscPress": "Couverture de Presse",
     "menuMiscContact": "Contact",
diff --git a/data/localization/he/strings.json b/data/localization/he/strings.json
index 45a42ccb..ffbe91d0 100644
--- a/data/localization/he/strings.json
+++ b/data/localization/he/strings.json
@@ -170,10 +170,6 @@
     "screenshotsViewerPrevious": "קודם",
     "screenshotsViewerNext": "הבא",
     "screenshotsViewerBack": "חזור",
-    "subprojectsTitle": "פרויקטים משנה",
-    "subprojectsContentTitle": "פרויקטים משנה",
-    "subprojectsIntroP1": "צוות ScummVM עובד מדי פעם על פרויקטים משנה שונים, נפרדים מתוכנית ScummVM הראשית. פרויקטים אלה עומדים בדרך כלל בעמידה סבירה ולא מקבלים עדיפות גבוהה. בלי קשר, דף זה כאן כדי ליידע אתכם עליהם, בתקווה מעורפל למשוך יותר מפתחים שיעזרו לתחזק את תוכניות הלוואי הללו.",
-    "subprojectsIntroP2": "אנא אל תשאלו היכן תוכלו להשיג בינאריים של תוכניות אלה. נכון לעכשיו שתי פרוייקטים המשנה עדיין במצב שמתאים רק למפתחים ... כך שאם אינך יכול להרכיב את הקוד בעצמך, אז אלה לא ממש מוכנים עבורך.",
     "cookieText": "אנו משתמשים בעוגיות כדי לשפר את התוכן ולנתח מידע על ביצועי האתר והשימוש בו.",
     "cookieAccept": "אפשר עוגיות",
     "cookieDecline": "לסרב לעוגיות",
@@ -198,7 +194,6 @@
     "menuDevelopmentSourceCode": "עץ קוד המקור",
     "menuDevelopmentBuildbot": "Buildbot",
     "menuHeaderMisc": "שונות תפריט",
-    "menuMiscSubprojects": "פרויקטים משנה",
     "menuMiscDemos": "הדגמות",
     "menuMiscPress": "סיקור עיתונות",
     "menuMiscContact": "איש קשר",
diff --git a/data/localization/it/strings.json b/data/localization/it/strings.json
index 1c8800da..6415e9a0 100644
--- a/data/localization/it/strings.json
+++ b/data/localization/it/strings.json
@@ -141,10 +141,6 @@
     "screenshotsViewerPrevious": "Precedente",
     "screenshotsViewerNext": "Successivo",
     "screenshotsViewerBack": "Indietro",
-    "subprojectsTitle": "Sottoprogetti",
-    "subprojectsContentTitle": "Sottoprogetti",
-    "subprojectsIntroP1": "Il team di ScummVM si occupa occasionalmente di una serie di sottoprogetti, separati dal progetto ScummVM principale. Si tratta generalmente di progetti a bassa priorità e spesso stagnanti. Questa pagina fornisce comunque informazioni utili a riguardo, con la speranza di attirare sviluppatori che aiutino a mantenere tali sottoprogetti aggiornati.",
-    "subprojectsIntroP2": "Per favore, non chiedere dove ottenere binari per questi programmi. Al momento entrambi i sottoprogetti, allo stato in cui si trovano, sono utilizzabili solo dagli sviluppatori... se non sei in grado di compilarli da te partendo dai sorgenti, probabilmente non sono (ancora) per te.",
     "menuHeaderMain": "Menu Principale",
     "menuMainHome": "Home",
     "menuMainScreenshots": "Screenshot",
@@ -166,7 +162,6 @@
     "menuDevelopmentSourceCode": "Codice Sorgente",
     "menuDevelopmentBuildbot": "Buildbot",
     "menuHeaderMisc": "Varie",
-    "menuMiscSubprojects": "Sottoprogetti",
     "menuMiscDemos": "Demo",
     "menuMiscPress": "Rassegna Stampa",
     "menuMiscContact": "Contattaci",
diff --git a/data/localization/pl/strings.json b/data/localization/pl/strings.json
index 47dd8244..13cd3f3b 100644
--- a/data/localization/pl/strings.json
+++ b/data/localization/pl/strings.json
@@ -174,10 +174,6 @@
     "screenshotsViewerPrevious": "",
     "screenshotsViewerNext": "",
     "screenshotsViewerBack": "",
-    "subprojectsTitle": "",
-    "subprojectsContentTitle": "",
-    "subprojectsIntroP1": "",
-    "subprojectsIntroP2": "",
     "cookieText": "",
     "cookieAccept": "",
     "cookieDecline": "",
@@ -202,7 +198,6 @@
     "menuDevelopmentSourceCode": "",
     "menuDevelopmentBuildbot": "",
     "menuHeaderMisc": "",
-    "menuMiscSubprojects": "",
     "menuMiscDemos": "",
     "menuMiscPress": "",
     "menuMiscContact": "",
diff --git a/data/localization/pt-BR/strings.json b/data/localization/pt-BR/strings.json
index 8fe4ee8b..7e3c5c6d 100644
--- a/data/localization/pt-BR/strings.json
+++ b/data/localization/pt-BR/strings.json
@@ -170,10 +170,6 @@
     "screenshotsViewerPrevious": "Anterior",
     "screenshotsViewerNext": "Próximo",
     "screenshotsViewerBack": "Voltar",
-    "subprojectsTitle": "Subprojetos",
-    "subprojectsContentTitle": "Subprojetos",
-    "subprojectsIntroP1": "O time do ScummVM ocasionalmente trabalha em vários subprojetos, separados do programa principal ScummVM. Estes projetos geralmente estão razoavelmente estagnados e não recebem alta prioridade. Independente disso, esta página está aqui para informá-lo sobre eles, na vaga esperança de atrair mais desenvolvedores para ajudar a manter estes projetos paralelos.",
-    "subprojectsIntroP2": "Por favor, não pergunte onde você pode obter os binários destes programas. Atualmente ambos os subprojetos estão em um estado adequado apenas para desenvolvedores... portanto se não consegue compilar o código por si próprio, eles não estão prontos para você.",
     "cookieText": "Nós utilizamos cookies para melhorar o conteúdo e analisar informações sobre a performance e utilização do site.",
     "cookieAccept": "Permitir Cookies",
     "cookieDecline": "Recusar Cookies",
@@ -198,7 +194,6 @@
     "menuDevelopmentSourceCode": "Código Fonte",
     "menuDevelopmentBuildbot": "Bot de Compilação",
     "menuHeaderMisc": "Diversos",
-    "menuMiscSubprojects": "Subprojetos",
     "menuMiscDemos": "Demonstrações",
     "menuMiscPress": "Cobertura da Imprensa",
     "menuMiscContact": "Contato",
diff --git a/data/localization/pt-PT/strings.json b/data/localization/pt-PT/strings.json
index 778f1485..5b60e1cb 100644
--- a/data/localization/pt-PT/strings.json
+++ b/data/localization/pt-PT/strings.json
@@ -178,10 +178,6 @@
     "sponsorsContentTitle": "Patrocinadores",
     "sponsorsHeading": "Patrocinadores do ScummVM",
     "sponsorsIntro": "As seguintes empresas tiveram a gentileza de assistir o projeto ScummVM",
-    "subprojectsTitle": "Subprojetos",
-    "subprojectsContentTitle": "Subprojetos",
-    "subprojectsIntroP1": "",
-    "subprojectsIntroP2": "",
     "cookieText": "",
     "cookieAccept": "Permitir Cookies",
     "cookieDecline": "Recusar Cookies",
@@ -207,7 +203,6 @@
     "menuDevelopmentBuildbot": "Buildbot",
     "menuHeaderMisc": "Diversos",
     "menuMiscSponsors": "Patrocinadores",
-    "menuMiscSubprojects": "Subprojetos",
     "menuMiscDemos": "Demonstrações",
     "menuMiscPress": "Cobertura Jornalística",
     "menuMiscContact": "Contatos",
diff --git a/data/localization/ru/strings.json b/data/localization/ru/strings.json
index 183183ea..12335359 100644
--- a/data/localization/ru/strings.json
+++ b/data/localization/ru/strings.json
@@ -144,10 +144,6 @@
     "screenshotsViewerPrevious": "Предыдущий",
     "screenshotsViewerNext": "Следующий",
     "screenshotsViewerBack": "Назад",
-    "subprojectsTitle": "Подпроекты",
-    "subprojectsContentTitle": "Подпроекты",
-    "subprojectsIntroP1": "Время от времени команда ScummVM работает над различными подпроектами, отделёнными от основной программы ScummVM. Обычно эти проекты развиваются небыстро, и приоритет у них невысокий. Тем не менее, на этой странице мы информируем вас об этих проектах с надеждой, что кто-то из разработчиков может заинтересоваться в том, чтобы помочь их развивать и сопровождать.",
-    "subprojectsIntroP2": "Пожалуйста, не спрашивайте, где взять исполнимые файлы этих проектов. На сегодняшний день проекты всё ещё находятся в состоянии, требующем навыки разработки ПО для того, чтобы ими пользоваться… Поэтому, если вы не в состоянии скомпилировать коды сами, эти проекты пока, к сожалению, не для вас.",
     "menuHeaderMain": "Главное меню",
     "menuMainHome": "На главную",
     "menuMainScreenshots": "Скриншоты",
@@ -169,7 +165,6 @@
     "menuDevelopmentSourceCode": "Исходные коды",
     "menuDevelopmentBuildbot": "Buildbot",
     "menuHeaderMisc": "Pазное",
-    "menuMiscSubprojects": "Подпроекты",
     "menuMiscDemos": "Демоверсии",
     "menuMiscPress": "Пресса о нас",
     "menuMiscContact": "Контакты",
diff --git a/data/menus.yaml b/data/menus.yaml
index 003c29bc..d26ec7f0 100644
--- a/data/menus.yaml
+++ b/data/menus.yaml
@@ -46,8 +46,6 @@
   links:
     - name: '{#menuMiscSponsors#}'
       href: /sponsors/
-    - name: '{#menuMiscSubprojects#}'
-      href: /subprojects/
     - name: '{#menuMiscDemos#}'
       href: /demos/
     - name: '{#menuMiscPress#}'
diff --git a/data/subprojects.xml b/data/subprojects.xml
deleted file mode 100644
index fa38748a..00000000
--- a/data/subprojects.xml
+++ /dev/null
@@ -1,79 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<subprojects xmlns:h="http://www.w3.org/TR/html4/">
-	<project>
-		<name>ScummEx (svn subtree 'scummex')</name>
-		<info>
-			<h:p>
-				ScummEx is a multi-platform SCUMM resource browser, viewer and extractor using the wxWindows toolkit.
-			</h:p>
-			<h:p>
-				Development on this project is currently stalled. The code-base needs quite some cleanup, and viewers for many resource types still need adding to the code. Patches and volunteers are very welcome...
-			</h:p>
-			<h:p>
-				You can try compiled engine for:
-			</h:p>
-		</info>
-		<entries>
-			<file>
-				<category_icon>windows</category_icon>
-				<url extra_info="true" type="extras">ScummEx/scummex-win32.exe</url>
-				<name>Windows</name>
-				<type>daily</type>
-			</file>
-		</entries>
-	</project>
-<!--
-	<project>
-		<name>Residual (svn subtree 'residual')</name>
-		<info>
-			<h:p>
-				Residual is a LUA-powered 3D GRIME clone, designed to run the game Grim Fandango. Why 'Residual'? Because this engine covers games that the main ScummVM application will not support due to their 3D nature. Also, GRIME is a residue. Yes, we know, it's a bad word pun.
-			</h:p>
-			<h:p>
-				Residual's core is in a fairly decent state, however it is not in full-time development and as such is progressing slowly.
-			</h:p>
-			<h:p>
-				You can try compiled engine for:
-			</h:p>
-		</info>
-		<entries>
-			<file>
-				<category_icon>windows</category_icon>
-				<url extra_info="true" type="downloads">residualwin32.exe</url>
-				<name>Windows</name>
-				<type>svn</type>
-			</file>
-			<file>
-				<category_icon>macos</category_icon>
-				<url extra_info="true" type="downloads">Residual-MacOSX-Intel.dmg</url>
-				<name>Mac OS X Intel</name>
-				<type>svn</type>
-			</file>
-			<file>
-				<category_icon>debian</category_icon>
-				<url extra_info="true" type="downloads">residual_debian_i386.deb</url>
-				<name>Debian i386</name>
-				<type>svn</type>
-			</file>
-			<file>
-				<category_icon>debian</category_icon>
-				<url extra_info="true" type="downloads">residual_debian_amd64.deb</url>
-				<name>Debian x86_64</name>
-				<type>svn</type>
-			</file>
-			<file>
-				<category_icon>ubuntu</category_icon>
-				<url extra_info="true" type="downloads">residual_ubuntu_i386.deb</url>
-				<name>Ubuntu i386</name>
-				<type>svn</type>
-			</file>
-			<file>
-				<category_icon>ubuntu</category_icon>
-				<url extra_info="true" type="downloads">residual_ubuntu_amd64.deb</url>
-				<name>Ubuntu x86_64</name>
-				<type>svn</type>
-			</file>
-		</entries>
-	</project>
--->
-</subprojects>
diff --git a/include/Models/SubprojectsModel.php b/include/Models/SubprojectsModel.php
deleted file mode 100644
index 56223830..00000000
--- a/include/Models/SubprojectsModel.php
+++ /dev/null
@@ -1,44 +0,0 @@
-<?php
-namespace ScummVM\Models;
-
-use ScummVM\Objects\Subproject;
-use ScummVM\Objects\File;
-use ScummVM\Objects\BasicObject;
-use ScummVM\XMLParser;
-
-/**
- * The SubprojectsModel will generate Project objects.
- */
-class SubprojectsModel extends BasicModel
-{
-    /* Get all the groups and the respectively demos. */
-    public function getAllSubprojects()
-    {
-        $entries = $this->getFromCache();
-        if (is_null($entries)) {
-            $fname = DIR_DATA . '/subprojects.xml';
-            $parser = new XMLParser();
-            $parsedData = $parser->parseByFilename($fname);
-            $entries = array();
-            foreach (array($parsedData['subprojects']['project']) as $key => $value) {
-                $downloads = array();
-                foreach (array($value['entries']) as $type => $data) {
-                    if ($type == 'file') {
-                        foreach ($data as $file) {
-                            $downloads[] = new File($file);
-                        }
-                    }
-                }
-                $entries[] = new Subproject(
-                    array(
-                    'name' => $value['name'],
-                    'info' => $value['info'],
-                    'downloads' => $downloads,
-                    )
-                );
-            }
-            $this->saveToCache($entries);
-        }
-        return $entries;
-    }
-}
diff --git a/include/Objects/Subproject.php b/include/Objects/Subproject.php
deleted file mode 100644
index b053c48e..00000000
--- a/include/Objects/Subproject.php
+++ /dev/null
@@ -1,32 +0,0 @@
-<?php
-namespace ScummVM\Objects;
-
-/**
- * The Subproject class represents a subproject on the website.
- */
-class Subproject extends BasicObject
-{
-
-    private $info;
-    private $downloads;
-
-    /* Subproject object constructor. */
-    public function __construct($data)
-    {
-        parent::__construct($data);
-        $this->info = $data['info'];
-        $this->downloads = $data['downloads'];
-    }
-
-    /* Get the information text for this project. */
-    public function getInfo()
-    {
-        return $this->info;
-    }
-
-    /* Get the list of downloads available for this project. */
-    public function getDownloads()
-    {
-        return $this->downloads;
-    }
-}
diff --git a/include/Pages/SubprojectsPage.php b/include/Pages/SubprojectsPage.php
deleted file mode 100644
index f6a8663c..00000000
--- a/include/Pages/SubprojectsPage.php
+++ /dev/null
@@ -1,30 +0,0 @@
-<?php
-namespace ScummVM\Pages;
-
-use ScummVM\Controller;
-use ScummVM\Models\SubprojectsModel;
-
-class SubprojectsPage extends Controller
-{
-    private $subprojectsModel;
-    /* Constructor. */
-    public function __construct()
-    {
-        parent::__construct();
-        $this->template = 'pages/subprojects.tpl';
-        $this->subprojectsModel = new SubprojectsModel();
-    }
-
-    /* Display the index page. */
-    public function index()
-    {
-        $subprojects = $this->subprojectsModel->getAllSubprojects();
-        return $this->renderPage(
-            array(
-                'title' => $this->getConfigVars('subprojectsTitle'),
-                'content_title' => $this->getConfigVars('subprojectsContentTitle'),
-                'subprojects' => $subprojects,
-            )
-        );
-    }
-}
diff --git a/public_html/index.php b/public_html/index.php
index 63406ae0..a87cc928 100644
--- a/public_html/index.php
+++ b/public_html/index.php
@@ -116,7 +116,7 @@ $pages = array(
     'screenshots'                           => '\ScummVM\Pages\ScreenshotsPage',
     'screenshots/[a:category]'              => '\ScummVM\Pages\ScreenshotsPage',
     'screenshots/[a:category]/[:game]'      => '\ScummVM\Pages\ScreenshotsPage',
-    'subprojects'                           => '\ScummVM\Pages\SubprojectsPage',
+    'subprojects'                           => '\ScummVM\Pages\DownloadsPage', // TODO: Remove
     'sponsors'                              => '\ScummVM\Pages\SponsorsPage',
 );
 
diff --git a/templates/pages/subprojects.tpl b/templates/pages/subprojects.tpl
deleted file mode 100644
index 818a410b..00000000
--- a/templates/pages/subprojects.tpl
+++ /dev/null
@@ -1,20 +0,0 @@
-{capture "intro"}
-    <p>
-        {#subprojectsIntroP1#}
-    </p>
-    <p>
-        {#subprojectsIntroP2#}
-    </p>
-{/capture}
-
-{capture "content"}
-{foreach from=$subprojects item=project}
-<div class="subhead">{$project->getName()}</div>
-<div class="subhead-content">
-    {$project->getInfo()}
-    {include file='components/list_items.tpl' list=$project->getDownloads() type='platforms'}
-</div>
-{/foreach}
-{/capture}
-
-{include file="components/box.tpl" head=$content_title intro=$smarty.capture.intro content=$smarty.capture.content}
\ No newline at end of file




More information about the Scummvm-git-logs mailing list