Calendar: Remove recurring events for summer break 2024

Reviewed-on: #56

inc/include.php

@@ -24,9 +24,9 @@ use \pvv\side\Agenda;
 $agenda = new \pvv\side\Agenda([
   // new \pvv\side\social\NerdepitsaActivity,
   // new \pvv\side\social\AnimekveldActivity,
-  new \pvv\side\social\HackekveldActivity,
-  new \pvv\side\social\BrettspillActivity,
-  new \pvv\side\social\DriftkveldActivity,
+  // new \pvv\side\social\HackekveldActivity,
+  // new \pvv\side\social\BrettspillActivity,
+  // new \pvv\side\social\DriftkveldActivity,
   new \pvv\side\DBActivity($pdo),
 ]);
 

nix/module.nix

@@ -217,14 +217,14 @@ in
             '';
           };
 
-          ${cfg.settings.GALLERY.SERVER_PATH} = {
+          "^~ ${cfg.settings.GALLERY.SERVER_PATH}" = {
             root = cfg.settings.GALLERY.DIR;
             extraConfig = ''
               rewrite ^${cfg.settings.GALLERY.SERVER_PATH}/(.*)$ /$1 break;
             '';
           };
 
-          ${cfg.settings.SLIDESHOW.SERVER_PATH} = {
+          "^~ ${cfg.settings.SLIDESHOW.SERVER_PATH}" = {
             root = cfg.settings.SLIDESHOW.DIR;
             extraConfig = ''
               rewrite ^${cfg.settings.SLIDESHOW.SERVER_PATH}/(.*)$ /$1 break;

www/galleri/index.php

@@ -52,6 +52,17 @@ function getDirContents($dir, &$results = array()) {
 }
 $images = getDirContents($galleryDir);
 
+function cmpModifyTime($a, $b) {
+	global $galleryDir;
+
+        $mtime_a = filemtime($galleryDir . $a);
+        $mtime_b = filemtime($galleryDir . $b);
+
+	return ($mtime_a > $mtime_b) ? -1 : 1;
+}
+
+usort($images, "cmpModifyTime");
+
 $imageTemplate = '
 <div class="card">
     <div class="card-image-div">
@@ -105,7 +116,6 @@ $imageTemplate = '
             $vars = [
                 "%user"         =>  htmlspecialchars($imguser),
                 "%time"         =>  $modTime,
-                "%timestamp"    =>  filemtime($galleryDir . $value),
                 "%name"         =>  htmlspecialchars($displaypath),
                 "%path"         =>  $serverPath . $value,
 		"%thumbnail"    =>  $serverPath . "/.thumbnails" . $value . ".png",

www/js/slideshow.js

@@ -21,7 +21,7 @@ function stepSlideshow(imgs) {
         //Change source to next picture after it is faded out
         slideshowIndex = (slideshowIndex + 1) % imgs.length; 
         ssi2.src = slideshowFnames[slideshowIndex];
-    }, 800);  
+    }, 1000);
 }
 
 //Initialize slideshow, start interval
@@ -29,4 +29,4 @@ if (slideshowFnames.length > 1) {
     slideshowInterval = setInterval(()=>{
         stepSlideshow(slideshowFnames);
     }, SLIDESHOWDELAYMS);
-}
+}

www/tjenester/index.php

@@ -28,31 +28,22 @@ require_once dirname(dirname(__DIR__)) . implode(DIRECTORY_SEPARATOR, ['', 'inc'
             <div class="categoryContent">
 
               <div class="service">
+                <div class="serviceContent">
+                  <h2 class="serviceTitle">Gitea</h2>
+                  <p class="serviceDescription">Vår interne git-tjener, åpen for alle medlemmer</p>
+                  <div class="serviceLink"><a href="https://git.pvv.ntnu.no" target="_blank">Gå til git.pvv.ntnu.no</a></div>
+                </div>
+                <img class="serviceImage" src="img/gitea.png" alt="Gitea-logo">
+              </div>
+
+	      <div class="service">
                 <div class="serviceContent">
                   <h2 class="serviceTitle">GitHub</h2>
                   <p class="serviceDescription">Våre offentlige kodebrønner, åpent for verden!</p>
                   <div class="serviceLink"><a href="https://github.com/Programvareverkstedet/" target="_blank">Gå til GitHub</a></div>
                 </div>
                 <img class="serviceImage" src="img/github.png" alt="GitHub-logo">
-              </div>
-
-              <div class="service">
-                <div class="serviceContent">
-                  <h2 class="serviceTitle">Gogs</h2>
-                  <p class="serviceDescription">Vår interne git-tjener, åpen for alle medlemmer</p>
-                  <div class="serviceLink"><a href="https://git.pvv.ntnu.no" target="_blank">Gå til git.pvv.ntnu.no</a></div>
-                </div>
-                <img class="serviceImage" src="img/gogs.png" alt="Gogs-logo">
-              </div>
-
-              <div class="service">
-                <div class="serviceContent">
-                  <h2 class="serviceTitle">Dev og Trac</h2>
-                  <p class="serviceDescription">Trac er vårt gamle prosjektsystem. Her kan du lage og dele prosjekter om du er for hipster for github.</p>
-                  <div class="serviceLink"><a href="https://dev.pvv.ntnu.no/projects/pvv-dev/" target="_blank">Gå til dev.pvv.ntnu.no</a></div>
-                </div>
-                <img class="serviceImage" src="img/trac.png" alt="Trac-logo">
-              </div>
+	      </div>
 
             </div>
           </div>