From 7dbce0bd243f6d873c725a3c91a6fdb55e2648f2 Mon Sep 17 00:00:00 2001 From: Peder Bergebakken Sundt Date: Mon, 13 Nov 2017 20:35:25 +0100 Subject: [PATCH 01/52] Add webmail to navbar, add generalized navbar to /om --- inc/navbar.php | 6 ++++- www/om/index.html | 66 ----------------------------------------------- www/om/index.php | 63 ++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 68 insertions(+), 67 deletions(-) delete mode 100644 www/om/index.html create mode 100644 www/om/index.php diff --git a/inc/navbar.php b/inc/navbar.php index 1f61c74..14229e1 100644 --- a/inc/navbar.php +++ b/inc/navbar.php @@ -7,11 +7,15 @@ function navbar($depth, $active = NULL) { 'aktiviteter' => 'aktiviteter', 'prosjekter' => 'prosjekt', 'kontakt' => 'kontakt', + 'webmail' => 'https://webmail.pvv.ntnu.no/', 'wiki' => 'pvv', ]; foreach($menuItems as $caption => $link) { + if ($caption !== 'webmail') { + $link = rtrim(str_repeat('../', $depth) . $link, '/') . '/'; + } $result .= "\t\t' - . '' + . '' . $caption . "\n" ; diff --git a/www/om/index.html b/www/om/index.html deleted file mode 100644 index 9f101e1..0000000 --- a/www/om/index.html +++ /dev/null @@ -1,66 +0,0 @@ - - - -Programvareverkstedet - - - - - - -
Programvareverkstedet
- -
- -
-

Om Programvareverkstedet

- -

Beskrivelse av PVV her

-
- -
-

Hva betyr det å være et medlem av PVV?

- -

Alle medlemmer av PVV får brukerkonto på PVV sine maskiner, epostadresse (brukernavn@pvv.ntnu.no og brukernavn@pvv.org) og 757 MB diskplass, som blant annet kan brukes til hjemmesider. Dersom du går tom for diskplass er det mulig å kjøpe utvidet diskkvote. For å aktivere brukerkonto på PVV, må man møte opp på lokalene slik at man får satt passord. - -

I tillegg får man tilgang til PVVs to oppholdsrom, rom 226 og 229 i Sentralbygg 2 (se kart over andre etasje i SBII). På rom 229 er det seks arbeidsstasjoner som kjører Linux, macOS, FreeBSD, samt bordplass, nettverksuttak og egen Wifi AP for laptoper. På rom 226 er det sofakrok med TV og diverse spillkonsoller. - -

Dersom du ønsker å lære Unix er det god anledning til det på PVV. Vi har et sterkt faglig miljø, med mange svært kunnskapsrike personer, som stort sett ikke har noe imot å hjelpe nybegynnere. Man kan få større privilegier her enn på stud-maskinene, for eksempel gjennom å bli med i PVV-drift. - -

PVV har gratis kaffe for medlemmer. Vi organiserer kurs og andre arrangementer. De aller fleste arrangementene er gratis. - -

PVV har også ei relativt innholdsrik boksamling til disposisjon for medlemmene, samt ei bokhylle full av blad og tegneserier. (For tiden abonnerer vi på Lunch tegneserie). Vi har i tillegg et romslig bokbudsjett, så dersom du har forslag til bøker/blad vi burde kjøpe inn er det bare å sende en mail til styret (pvv@pvv.ntnu.no). Ta en titt på hva som står i bokhyllen. - -

PVV har også en del brettspill du kan prøve. -

- -
-

Hvordan bli medlem

- -

Første steg for å bli medlem i PVV er å betale medlemskontingent. - -

Medlemskontingenten er kr 50,00 per år. Det er også mulig å bli livstidsmedlem ved å betale kr 1024,00 én gang. Kontingent betales til konto 8601.11.16916. Betalingen Må merkes med NTNU brukernavn. - -

Det er mulig å betale for flere år samtidig ved å betale et helt multiplum av kr 50. - -

Kontingentinnbetalinger blir registrert i medlemsdatabasen, og det er lurt å sjekke at betalingen din dukker opp her (merk at det kan ta litt tid fra du betaler til kasserer får beskjed om det, og deretter litt tid før kasserer fører betalingen inn i regnskap og medlemsdatabase). - -

- Registrer deg som bruker -

- -
- -
- - diff --git a/www/om/index.php b/www/om/index.php new file mode 100644 index 0000000..14545c5 --- /dev/null +++ b/www/om/index.php @@ -0,0 +1,63 @@ + + + + +Programvareverkstedet + + + + + + +
Programvareverkstedet
+ +
+ +
+

Om Programvareverkstedet

+ +

Velkommen til Programvareverkstedets wiki. Programvareverkstedet (PVV) er en studentorganisasjon ved Norges Teknisk-Naturvitenskapelige Universitet (NTNU). PVVs formål er å skape et miljø for datainteresserte personer tilknyttet universitetet. Nåværende og tidligere studenter ved NTNU, samt ansatte ved NTNU og tilstøtende miljø, kan bli medlemmer.

+
+ +
+

Hva betyr det å være et medlem av PVV?

+ +

Alle medlemmer av PVV får brukerkonto på PVV sine maskiner, epostadresse (brukernavn@pvv.ntnu.no og brukernavn@pvv.org) og 757 MB diskplass, som blant annet kan brukes til hjemmesider. Dersom du går tom for diskplass er det mulig å kjøpe utvidet diskkvote. For å aktivere brukerkonto på PVV, må man møte opp på lokalene slik at man får satt passord. + +

I tillegg får man tilgang til PVVs to oppholdsrom, rom 226 og 229 i Sentralbygg 2 (se kart over andre etasje i SBII). På rom 229 er det seks arbeidsstasjoner som kjører Linux, macOS, FreeBSD, samt bordplass, nettverksuttak og egen Wifi AP for laptoper. På rom 226 er det sofakrok med TV og diverse spillkonsoller. + +

Dersom du ønsker å lære Unix er det god anledning til det på PVV. Vi har et sterkt faglig miljø, med mange svært kunnskapsrike personer, som stort sett ikke har noe imot å hjelpe nybegynnere. Man kan få større privilegier her enn på stud-maskinene, for eksempel gjennom å bli med i PVV-drift. + +

PVV har gratis kaffe for medlemmer. Vi organiserer kurs og andre arrangementer. De aller fleste arrangementene er gratis. + +

PVV har også ei relativt innholdsrik boksamling til disposisjon for medlemmene, samt ei bokhylle full av blad og tegneserier. (For tiden abonnerer vi på Lunch tegneserie). Vi har i tillegg et romslig bokbudsjett, så dersom du har forslag til bøker/blad vi burde kjøpe inn er det bare å sende en mail til styret (pvv@pvv.ntnu.no). Ta en titt på hva som står i bokhyllen. + +

PVV har også en del brettspill du kan prøve. +

+ +
+

Hvordan bli medlem

+ +

Første steg for å bli medlem i PVV er å betale medlemskontingent. + +

Medlemskontingenten er kr 50,00 per år. Det er også mulig å bli livstidsmedlem ved å betale kr 1024,00 én gang. Kontingent betales til konto 8601.11.16916. Betalingen Må merkes med NTNU brukernavn. + +

Det er mulig å betale for flere år samtidig ved å betale et helt multiplum av kr 50. + +

Kontingentinnbetalinger blir registrert i medlemsdatabasen, og det er lurt å sjekke at betalingen din dukker opp her (merk at det kan ta litt tid fra du betaler til kasserer får beskjed om det, og deretter litt tid før kasserer fører betalingen inn i regnskap og medlemsdatabase). + +

+ Registrer deg som bruker +

+
+ +
+ + From 68f3bdb0970bd5f1fc7d93ae6642f67e1b39808f Mon Sep 17 00:00:00 2001 From: Peder Bergebakken Sundt Date: Mon, 13 Nov 2017 20:38:16 +0100 Subject: [PATCH 02/52] Add sane login button --- www/paamelding/index.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/www/paamelding/index.php b/www/paamelding/index.php index c918e13..8b9f225 100644 --- a/www/paamelding/index.php +++ b/www/paamelding/index.php @@ -77,7 +77,7 @@ if (isset($_SESSION['userdata'])) { // if logged in with feide
Todo: Legg til en "send mail" knapp - æ kanj itj lææv uten dæ piær! + Hent navn og epost fra Feide From cf95f90f5e7e769d3c3677f57f60006828464e35 Mon Sep 17 00:00:00 2001 From: Peder Bergebakken Sundt Date: Mon, 13 Nov 2017 20:43:10 +0100 Subject: [PATCH 03/52] A word Totally not copy-pasted from the wiki --- www/om/index.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/www/om/index.php b/www/om/index.php index 14545c5..38a35c3 100644 --- a/www/om/index.php +++ b/www/om/index.php @@ -20,7 +20,7 @@ p {hyphens: auto;}

Om Programvareverkstedet

-

Velkommen til Programvareverkstedets wiki. Programvareverkstedet (PVV) er en studentorganisasjon ved Norges Teknisk-Naturvitenskapelige Universitet (NTNU). PVVs formål er å skape et miljø for datainteresserte personer tilknyttet universitetet. Nåværende og tidligere studenter ved NTNU, samt ansatte ved NTNU og tilstøtende miljø, kan bli medlemmer.

+

Velkommen til Programvareverkstedets nettside. Programvareverkstedet (PVV) er en studentorganisasjon ved Norges Teknisk-Naturvitenskapelige Universitet (NTNU). PVVs formål er å skape et miljø for datainteresserte personer tilknyttet universitetet. Nåværende og tidligere studenter ved NTNU, samt ansatte ved NTNU og tilstøtende miljø, kan bli medlemmer.

From 49048fc973c418d242f5af0eb1b2ff1b0a95c735 Mon Sep 17 00:00:00 2001 From: Peder Bergebakken Sundt Date: Wed, 31 Jan 2018 01:19:31 +0100 Subject: [PATCH 04/52] Add Raleway font as default --- www/css/raleway-latin-ext.woff2 | Bin 0 -> 17300 bytes www/css/raleway-latin.woff2 | Bin 0 -> 20444 bytes www/css/style.css | 23 +++++++++++++++++++++++ 3 files changed, 23 insertions(+) create mode 100644 www/css/raleway-latin-ext.woff2 create mode 100644 www/css/raleway-latin.woff2 diff --git a/www/css/raleway-latin-ext.woff2 b/www/css/raleway-latin-ext.woff2 new file mode 100644 index 0000000000000000000000000000000000000000..a15cbb2130249a0f97224c31293fa34aa1660315 GIT binary patch literal 17300 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%0A(43>7kr-%IXyuo; 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 literal 0 HcmV?d00001 diff --git a/www/css/raleway-latin.woff2 b/www/css/raleway-latin.woff2 new file mode 100644 index 0000000000000000000000000000000000000000..eba29a9abed2a70f4fab3be4f53d3d8768c44709 GIT binary patch literal 20444 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 Xupf#F^(WeC^m$JzWd1YFgSg~(CVpYf literal 0 HcmV?d00001 diff --git a/www/css/style.css b/www/css/style.css index 7c5851a..2183dcb 100644 --- a/www/css/style.css +++ b/www/css/style.css @@ -1,3 +1,26 @@ +/* latin-ext */ +@font-face { + font-family: 'Raleway'; + font-style: normal; + font-weight: 400; + src: local('Raleway'), local('Raleway-Regular'), url("/css/raleway-latin-ext.woff2") format('woff2'); + unicode-range: U+0100-024F, U+0259, U+1E00-1EFF, U+20A0-20AB, U+20AD-20CF, U+2C60-2C7F, U+A720-A7FF; +} +/* latin */ +@font-face { + font-family: 'Raleway'; + font-style: normal; + font-weight: 400; + src: local('Raleway'), local('Raleway-Regular'), url() format('woff2'); + src: local('Raleway'), local('Raleway-Regular'), url("/css/raleway-latin.woff2") format('woff2'); + unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, U+02DC, U+2000-206F, U+2074, U+20AC, U+2122, U+2212, U+2215; +} +html{ + font-family: Raleway, sans-serif; + font-style: normal; + font-variant: normal; +} + nav ul { position: fixed; top: 0; From 6f2ab1ac0015f629dc468cadff5385692b9a75f5 Mon Sep 17 00:00:00 2001 From: Peder Bergebakken Sundt Date: Sat, 10 Feb 2018 18:00:32 +0100 Subject: [PATCH 05/52] Add mysql schemes and add test admin user for sqlite --- dist/pvv.sql | 5 ++++- dist/pvv_mysql.sql | 23 +++++++++++++++++++++++ pvv.sql | 23 ----------------------- 3 files changed, 27 insertions(+), 24 deletions(-) create mode 100644 dist/pvv_mysql.sql delete mode 100644 pvv.sql diff --git a/dist/pvv.sql b/dist/pvv.sql index 4325a96..d32c229 100644 --- a/dist/pvv.sql +++ b/dist/pvv.sql @@ -20,4 +20,7 @@ CREATE TABLE "projects" ( CREATE TABLE "users" ( "uname" TEXT, "groups" INT DEFAULT 0 -); \ No newline at end of file +); + +INSERT INTO users (uname, groups) +VALUES ("min_test_bruker", 1); diff --git a/dist/pvv_mysql.sql b/dist/pvv_mysql.sql new file mode 100644 index 0000000..24b98d8 --- /dev/null +++ b/dist/pvv_mysql.sql @@ -0,0 +1,23 @@ +CREATE TABLE events ( +`id` INTEGER PRIMARY KEY AUTO_INCREMENT, +`name` TEXT, +`start` TEXT, +`stop` TEXT, +`organiser` TEXT, +`location` TEXT, +`description` TEXT +); + +CREATE TABLE projects ( +`id` INTEGER PRIMARY KEY AUTO_INCREMENT, +`name` TEXT, +`owner` TEXT, +`owneruname` TEXT, +`description` TEXT, +`active` BOOLEAN +); + +CREATE TABLE users ( +`uname` TEXT, +`groups` INT DEFAULT 0 +); diff --git a/pvv.sql b/pvv.sql deleted file mode 100644 index 4325a96..0000000 --- a/pvv.sql +++ /dev/null @@ -1,23 +0,0 @@ -CREATE TABLE "events" ( -"id" INTEGER PRIMARY KEY AUTOINCREMENT, -"name" TEXT, -"start" TEXT, -"stop" TEXT, -"organiser" TEXT, -"location" TEXT, -"description" TEXT -); - -CREATE TABLE "projects" ( -"id" INTEGER PRIMARY KEY AUTOINCREMENT, -"name" TEXT, -"owner" TEXT, -"owneruname" TEXT, -"description" TEXT, -"active" BOOLEAN -); - -CREATE TABLE "users" ( -"uname" TEXT, -"groups" INT DEFAULT 0 -); \ No newline at end of file From 5dd226094853db9e1ab04374835105dd843021d7 Mon Sep 17 00:00:00 2001 From: Peder Bergebakken Sundt Date: Sat, 10 Feb 2018 18:01:53 +0100 Subject: [PATCH 06/52] Fix dbactivity queries, missing a required column --- src/pvv/side/dbactivity.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/pvv/side/dbactivity.php b/src/pvv/side/dbactivity.php index 0a90f70..ea6ebdd 100644 --- a/src/pvv/side/dbactivity.php +++ b/src/pvv/side/dbactivity.php @@ -54,12 +54,12 @@ class DBActivity implements Activity { public function getNextEventFrom(DateTimeImmutable $date) { - $query = 'SELECT name,start,stop,organiser,location,description FROM events WHERE start > :date ORDER BY start ASC LIMIT 1'; + $query = 'SELECT id,name,start,stop,organiser,location,description FROM events WHERE start > :date ORDER BY start ASC LIMIT 1'; return $this->retrieve($date, $query); } public function getPreviousEventFrom(DateTimeImmutable $date) { - $query = 'SELECT name,start,stop,organiser,location,description FROM events WHERE start < :date ORDER BY start DESC LIMIT 1'; + $query = 'SELECT id,name,start,stop,organiser,location,description FROM events WHERE start < :date ORDER BY start DESC LIMIT 1'; return $this->retrieve($date, $query); } From b914590ea85e57c58f4a49db356f95703e6cbb92 Mon Sep 17 00:00:00 2001 From: Peder Bergebakken Sundt Date: Sat, 10 Feb 2018 18:02:46 +0100 Subject: [PATCH 07/52] Reduce the use of Raleways to headers and list items --- www/css/style.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/www/css/style.css b/www/css/style.css index 2183dcb..b648508 100644 --- a/www/css/style.css +++ b/www/css/style.css @@ -15,7 +15,7 @@ src: local('Raleway'), local('Raleway-Regular'), url("/css/raleway-latin.woff2") format('woff2'); unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, U+02DC, U+2000-206F, U+2074, U+20AC, U+2122, U+2212, U+2215; } -html{ +h1, h2, h3, h4, h5, h6, li, a.btn, p.login{ font-family: Raleway, sans-serif; font-style: normal; font-variant: normal; From 25da4a80f25ddd967f86d9f79bdcf6a57c1f7e29 Mon Sep 17 00:00:00 2001 From: Peder Bergebakken Sundt Date: Sat, 10 Feb 2018 18:05:38 +0100 Subject: [PATCH 08/52] Fix navbar on some pages --- www/admin/brukere/index.php | 22 ++++------------------ www/prosjekt/mine.php | 1 + 2 files changed, 5 insertions(+), 18 deletions(-) diff --git a/www/admin/brukere/index.php b/www/admin/brukere/index.php index 741a48e..3be9d65 100644 --- a/www/admin/brukere/index.php +++ b/www/admin/brukere/index.php @@ -3,6 +3,7 @@ ini_set('display_errors', '1'); date_default_timezone_set('Europe/Oslo'); setlocale(LC_ALL, 'no_NO'); error_reporting(E_ALL); +require __DIR__ . '/../../../inc/navbar.php'; require __DIR__ . '/../../../src/_autoload.php'; require __DIR__ . '/../../../sql_config.php'; require_once(__DIR__ . '/../../../vendor/simplesamlphp/simplesamlphp/lib/_autoload.php'); @@ -34,23 +35,8 @@ $users = $userManager->getAllUserData();
Bruker­administrasjon
@@ -102,4 +88,4 @@ $users = $userManager->getAllUserData();
- \ No newline at end of file + diff --git a/www/prosjekt/mine.php b/www/prosjekt/mine.php index 28244cf..79faa2e 100644 --- a/www/prosjekt/mine.php +++ b/www/prosjekt/mine.php @@ -1,6 +1,7 @@ Date: Sat, 10 Feb 2018 18:08:53 +0100 Subject: [PATCH 09/52] Norwegian localisation fixes --- www/admin/aktiviteter/edit.php | 2 +- www/admin/aktiviteter/index.php | 2 +- www/admin/aktiviteter/update.php | 2 +- www/admin/brukere/index.php | 2 +- www/admin/brukere/update.php | 2 +- www/admin/prosjekter/edit.php | 2 +- www/admin/prosjekter/index.php | 2 +- www/admin/prosjekter/update.php | 2 +- www/aktiviteter/index.php | 2 +- www/anime/index.php | 2 +- www/brettspill/index.php | 2 +- www/index.php | 2 +- www/kalender/index.php | 18 +++++++++--------- www/kontakt/index.php | 2 +- www/kurs/index.php | 2 +- www/nerdepitsa/index.php | 2 +- www/prosjekt/edit.php | 2 +- www/prosjekt/mine.php | 2 +- www/prosjekt/update.php | 2 +- 19 files changed, 27 insertions(+), 27 deletions(-) diff --git a/www/admin/aktiviteter/edit.php b/www/admin/aktiviteter/edit.php index 948b74f..29cef9a 100644 --- a/www/admin/aktiviteter/edit.php +++ b/www/admin/aktiviteter/edit.php @@ -1,6 +1,6 @@ setAttribute(PDO::ATTR_ERRMODE, PDO::ERRMODE_EXCEPTION); $agenda = new \pvv\side\Agenda([ @@ -60,13 +60,13 @@ $days_in_month = date('t', mktime(0, 0, 0, $month, 1, $year));