Merge pull request #1138 from lnbits/ad_space_update

Improved optional ad space

.env.example

@@ -6,15 +6,16 @@ PORT=5000
 
 DEBUG=false
 
-# Find "usr" string in wallet url to explicit allow users or set admins (comma separated list)
 LNBITS_ALLOWED_USERS=""
 LNBITS_ADMIN_USERS=""
 # Extensions only admin can access
 LNBITS_ADMIN_EXTENSIONS="ngrok"
 LNBITS_DEFAULT_WALLET_NAME="LNbits wallet"
 
-# csv ad image filepaths or urls, extensions can choose to honor
+# Ad space description
-LNBITS_AD_SPACE=""
+# LNBITS_AD_SPACE_TITLE="Supported by"
+# csv ad space, format "<url>;<img-light>;<img-dark>, <url>;<img-light>;<img-dark>", extensions can choose to honor
+# LNBITS_AD_SPACE=""
 
 # Hides wallet api, extensions can choose to honor
 LNBITS_HIDE_API=false

lnbits/core/templates/core/index.html

@@ -183,6 +183,23 @@
           <div class="col q-pl-md">&nbsp;</div>
         </div>
       </div>
+
+      {% if AD_SPACE %} {% for ADS in AD_SPACE %} {% set AD = ADS.split(';') %}
+      <div class="col-6 col-sm-4 col-md-8 q-gutter-y-sm">
+        <q-btn flat color="secondary" class="full-width q-mb-md"
+          >{{ AD_TITLE }}</q-btn
+        >
+
+        <a href="{{ AD[0] }}" class="q-ma-md">
+          <img
+            v-if="($q.dark.isActive)"
+            src="{{ AD[1] }}"
+            style="max-width: 90%"
+          />
+          <img v-else src="{{ AD[2] }}" style="max-width: 90%" />
+        </a>
+      </div>
+      {% endfor %} {% endif %}
     </div>
   </div>
 </div>

lnbits/core/templates/core/wallet.html

@@ -388,9 +388,14 @@
       {% endif %} {% if AD_SPACE %} {% for ADS in AD_SPACE %} {% set AD =
       ADS.split(';') %}
       <q-card>
-        <a href="{{ AD[0] }}"
+        <q-card-section>
-          ><img width="100%" src="{{ AD[1] }}"
+          <h6 class="text-subtitle1 q-mt-none q-mb-sm">{{ AD_TITLE }}</h6>
-        /></a> </q-card
+        </q-card-section>
+        <q-card-section class="q-pa-none">
+          <a href="{{ AD[0] }}" class="q-ma-md">
+            <img v-if="($q.dark.isActive)" src="{{ AD[1] }}" />
+            <img v-else src="{{ AD[2] }}" />
+          </a> </q-card-section></q-card
       >{% endfor %} {% endif %}
     </div>
   </div>

lnbits/helpers.py

@@ -163,6 +163,7 @@ def template_renderer(additional_folders: List = []) -> Jinja2Templates:
     )
 
     if settings.LNBITS_AD_SPACE:
+        t.env.globals["AD_TITLE"] = settings.LNBITS_AD_SPACE_TITLE
         t.env.globals["AD_SPACE"] = settings.LNBITS_AD_SPACE
     t.env.globals["HIDE_API"] = settings.LNBITS_HIDE_API
     t.env.globals["SITE_TITLE"] = settings.LNBITS_SITE_TITLE

lnbits/settings.py

@@ -40,6 +40,9 @@ LNBITS_DISABLED_EXTENSIONS: List[str] = [
     for x in env.list("LNBITS_DISABLED_EXTENSIONS", default=[], subcast=str)
 ]
 
+LNBITS_AD_SPACE_TITLE = env.str(
+    "LNBITS_AD_SPACE_TITLE", default="Optional Advert Space"
+)
 LNBITS_AD_SPACE = [x.strip(" ") for x in env.list("LNBITS_AD_SPACE", default=[])]
 LNBITS_HIDE_API = env.bool("LNBITS_HIDE_API", default=False)
 LNBITS_SITE_TITLE = env.str("LNBITS_SITE_TITLE", default="LNbits")