Merge branch 'main' into fix/nested-catalogues

canonical · Nov 11, 2024 · a1ee695 · a1ee695
2 parents 3c11d45 + 2236646
commit a1ee695
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 10 deletions.
diff --git a/charm/config.yaml b/charm/config.yaml
@@ -37,8 +37,8 @@ options:
           "category": "Social",
           "items": [
             {
-              "name": "Mattermost",
-              "url": "https://chat.charmhub.io",
+              "name": "Ubuntu Matrix Community",
+              "url": "https://matrix.to/#/#community:ubuntu.com",
               "target": "_blank"
             },
             {
@@ -48,4 +48,4 @@ options:
             }
           ]
         }
-      ]
+      ]
diff --git a/charm/src/charm.py b/charm/src/charm.py
@@ -76,6 +76,7 @@ def __init__(self, *args):
             charm=self,
             port=self._internal_port,
             strip_prefix=True,
+            redirect_https=True,
             scheme=lambda: urlparse(self._internal_url).scheme,
         )
 
@@ -210,8 +211,7 @@ def _configure(self, items, push_certs: bool = False):
                 logger.error(msg)
                 return
 
-        if self.unit.is_leader():
-            self._update_status(ActiveStatus())
+        self._update_status(ActiveStatus())
 
     def _update_pebble_layer(self) -> bool:
         current_layer = self.workload.get_plan()

diff --git a/workload/ui/index.html b/workload/ui/index.html
@@ -61,7 +61,8 @@ <h3>Applications</h3>
         <ul class="p-matrix" id="apps">
           {{! --- Apps --- }}
           {{#each apps}}
-             <li class="p-matrix__item">
+              <li class="p-matrix__item">
+			  {{#if name}}
               <div class="p-matrix__img">
                 <span class="iconify icon md-48" data-icon="mdi-{{icon}}"></span>
               </div>
@@ -71,7 +72,8 @@ <h3 class="p-matrix__title"><a class="p-matrix__link" href="{{url}}">{{name}}</a
                 <p class="p-matrix__desc">{{description}}</p>
                 {{/if}}  
               </div>
-            </li>
+			  {{/if}}
+              </li>
             {{/each}}
         </ul>
         {{else}}

diff --git a/workload/ui/ui.css b/workload/ui/ui.css
@@ -4,10 +4,14 @@
     border: 1px solid #d9d9d9;
     padding: 8px;
     border-radius: 100%;
-  }
+}
 
-  .link-list {
+.p-matrix__item {
+    border: 0;
+}
+
+.link-list {
     list-style-type: none;
     margin: 0;
     padding: 0;
-  }
+}