Removed Games from GUI; Renamed Mods to Clientmods

diff --git a/app/blueprints/packages/packages.py b/app/blueprints/packages/packages.py
index 0634a77e09a0743817e6b8efa524c62f3ae00053..3f344aaf0a824d3b801a6676bba73d517e8e3b38 100644 (file)
--- a/app/blueprints/packages/packages.py
+++ b/app/blueprints/packages/packages.py
@@ -38,8 +38,8 @@ from urllib.parse import quote as urlescape
 from celery import uuid
 
 
-@menu.register_menu(bp, ".mods", "Mods", order=11, endpoint_arguments_constructor=lambda: { 'type': 'mod' })
-@menu.register_menu(bp, ".games", "Games", order=12, endpoint_arguments_constructor=lambda: { 'type': 'game' })
+@menu.register_menu(bp, ".mods", "Clientmods", order=11, endpoint_arguments_constructor=lambda: { 'type': 'mod' })
+#@menu.register_menu(bp, ".games", "Games", order=12, endpoint_arguments_constructor=lambda: { 'type': 'game' })
 @menu.register_menu(bp, ".txp", "Texture Packs", order=13, endpoint_arguments_constructor=lambda: { 'type': 'txp' })
 @menu.register_menu(bp, ".random", "Random", order=14, endpoint_arguments_constructor=lambda: { 'random': '1', 'lucky': '1' })
 @bp.route("/packages/")
@@ -228,7 +228,7 @@ class PackageForm(FlaskForm):
        title            = StringField("Title (Human-readable)", [InputRequired(), Length(3, 100)])
        short_desc       = StringField("Short Description (Plaintext)", [InputRequired(), Length(1,200)])
        desc             = TextAreaField("Long Description (Markdown)", [Optional(), Length(0,10000)])
-       type             = SelectField("Type", [InputRequired()], choices=PackageType.choices(), coerce=PackageType.coerce, default=PackageType.MOD)
+       type             = SelectField("Type", [InputRequired()], choices=PackageType.choices_cheat(), coerce=PackageType.coerce, default=PackageType.MOD)
        license          = QuerySelectField("License", [DataRequired()], allow_blank=True, query_factory=lambda: License.query.order_by(db.asc(License.name)), get_pk=lambda a: a.id, get_label=lambda a: a.name)
        media_license    = QuerySelectField("Media License", [DataRequired()], allow_blank=True, query_factory=lambda: License.query.order_by(db.asc(License.name)), get_pk=lambda a: a.id, get_label=lambda a: a.name)
        tags             = QuerySelectMultipleField('Tags', query_factory=lambda: Tag.query.order_by(db.asc(Tag.name)), get_pk=lambda a: a.id, get_label=makeLabel)

diff --git a/app/models.py b/app/models.py
index cbb91dac67855327c2345983e5005b9393af3f53..4289781cf6db6e8bdec04eb7e8c437cdd9ccdd88 100644 (file)
--- a/app/models.py
+++ b/app/models.py
@@ -311,7 +311,7 @@ class License(db.Model):
 
 
 class PackageType(enum.Enum):
-       MOD  = "Mod"
+       MOD  = "Clientmod"
        GAME = "Game"
        TXP  = "Texture Pack"
 
@@ -332,6 +332,12 @@ class PackageType(enum.Enum):
        def choices(cls):
                return [(choice, choice.value) for choice in cls]
 
+       @classmethod
+       def choices_cheat(cls):
+               c = cls.choices()
+               c.remove((cls.GAME, cls.GAME.value))
+               return c
+
        @classmethod
        def coerce(cls, item):
                return item if type(item) == PackageType else PackageType[item]

diff --git a/app/templates/index.html b/app/templates/index.html
index b107e8b41fd5ca3e0ac85623fec4b0c27ae85de2..2f0b8759c9cf02dc969146d88e98916c1248a244 100644 (file)
--- a/app/templates/index.html
+++ b/app/templates/index.html
@@ -36,18 +36,18 @@
        <h2 class="my-3">{{ _("Recently Updated") }}</h2>
        {{ render_pkggrid(updated) }}
 
-
+       <!--
        <a href="{{ url_for('packages.list_all', type='game', sort='score', order='desc') }}" class="btn btn-secondary float-right">
                {{ _("See more") }}
        </a>
        <h2 class="my-3">{{ _("Top Games") }}</h2>
        {{ render_pkggrid(pop_gam) }}
-
+       -->
 
        <a href="{{ url_for('packages.list_all', type='mod', sort='score', order='desc') }}" class="btn btn-secondary float-right">
                {{ _("See more") }}
        </a>
-       <h2 class="my-3">{{ _("Top Mods") }}</h2>
+       <h2 class="my-3">{{ _("Top Clientmods") }}</h2>
        {{ render_pkggrid(pop_mod) }}