Markus Wang Halvorsen
54467ab9b9
Small project member related fixes
2018-02-24 21:09:31 +01:00
Markus Wang Halvorsen
30c8aa2032
Groundwork for project members
...
Tools for adding/removing members are coming soon (tm)
2018-02-24 21:09:15 +01:00
Markus Wang Halvorsen
d984dfb89c
Begin work on project pages
...
Also store project owners' emails as contact info
2018-02-24 19:41:57 +01:00
Markus Wang Halvorsen
63200f863b
Fix login button font when not active
2018-02-24 19:23:27 +01:00
Markus Wang Halvorsen
5412414ce1
Assimilate hendelser into the new standard
2018-02-24 17:56:42 +01:00
Markus Wang Halvorsen
ebe3ce0e1e
Better text breaking on hendelser
2018-02-24 17:49:17 +01:00
Markus Wang Halvorsen
43fb843b17
Fix missing p tag without violating the purity of plaintext
2018-02-24 17:45:51 +01:00
Markus Wang Halvorsen
3ccaf69549
Fix påmelding
...
screwed this up during merge prep, it ended up with basically the same content twice
2018-02-24 17:30:56 +01:00
Markus Wang Halvorsen
6777048dac
Fix login button on all pages
...
By passing PDO to the login bar so admins get their link
2018-02-24 17:02:00 +01:00
Markus Wang Halvorsen
3832d3fde0
Fix project description error in my projects page
2018-02-24 16:57:38 +01:00
Markus Wang Halvorsen
32f9653a6d
Prepare for merge
2018-02-24 16:53:17 +01:00
Peder Bergebakken Sundt
48d79f2635
Design tweaks
2018-02-20 20:45:03 +01:00
Peder Bergebakken Sundt
54428c2bab
Tweak calendar design
2018-02-20 20:31:28 +01:00
Peder Bergebakken Sundt
4ca408b8fe
Add colors to events and day-numbers in calendar
2018-02-20 20:07:32 +01:00
Peder Bergebakken Sundt
550161bba2
Add colors to each event in hendelse
2018-02-20 19:36:06 +01:00
Peder Bergebakken Sundt
f6174706f8
Started work on /hendelser/
...
This may replace /aktiviteter/ and /kalender/ in the navbar, and further link to those two
2018-02-20 18:57:38 +01:00
Peder Bergebakken Sundt
66504057b2
Fix bug in /aktiviteter/ when viewing a spesific date
2018-02-20 16:18:43 +01:00
Peder Bergebakken Sundt
b016d27adb
Fix /nerdepitsa and /anime navbar
2018-02-17 17:25:30 +01:00
Markus Wang Halvorsen
cf058dc7a9
Project cards
2018-02-14 17:56:19 +01:00
Markus Wang Halvorsen
9f935cd810
Implode with <br>
2018-02-14 17:55:41 +01:00
Yorin Anne De Jong
e88411eea4
Make the top menu as wide as possible
2018-02-13 23:15:51 +01:00
Yorin Anne De Jong
0bce2053cf
Fix missing namespace
2018-02-13 19:19:32 +01:00
Yorin Anne De Jong
1d65cab11d
Add hover effect for user menu
2018-02-13 19:17:09 +01:00
Yorin Anne De Jong
8f2299cee5
Fix regression where login button was not enabled when menu is open
2018-02-13 19:14:41 +01:00
Yorin Anne De Jong
ba0fe09d06
Workaround for PHP 5
2018-02-13 19:10:47 +01:00
Yorin Anne De Jong
73efba625b
Add a central include file
2018-02-13 19:08:41 +01:00
Yorin Anne De Jong
f2b75c81c1
Make sure that the user menu appears over the login button
2018-02-13 18:52:38 +01:00
Yorin Anne De Jong
060d37c040
Better styling of the user menu
2018-02-13 18:44:36 +01:00
Yorin Anne De Jong
24b6af1799
Add admin button to user menu, if admin
2018-02-13 18:30:49 +01:00
Yorin Anne De Jong
edde8b6927
Prevent strange jumping when opening menu, and add hover effects
2018-02-13 18:17:41 +01:00
Markus Wang Halvorsen
87c6523f35
Responsive design for landing page content
2018-02-13 17:23:21 +01:00
Yorin Anne De Jong
a4b01d1259
Add link to favicon
2018-02-13 17:11:39 +01:00
Yorin Anne De Jong
f811286e52
Align login menu
2018-02-13 17:11:11 +01:00
Yorin Anne De Jong
c38932046a
Small alignment fix
2018-02-13 17:05:09 +01:00
Markus Wang Halvorsen
f2a14f3791
Only show MOTD title if it is set
2018-02-13 17:02:03 +01:00
Yorin Anne De Jong
53af8dae44
Fix a regression where it is hard to close the menu on mobile
2018-02-13 17:00:01 +01:00
Markus Wang Halvorsen
1db31b9e56
Add MOTD
2018-02-13 16:58:54 +01:00
Markus Wang Halvorsen
af97383e01
last one of these i promise
2018-02-13 16:54:39 +01:00
Yorin Anne De Jong
e7f11aee54
Improve login/logout buttons
2018-02-13 16:48:00 +01:00
Markus Wang Halvorsen
98f882233c
Implode project description everywhere else
...
Forgot these
2018-02-13 16:41:03 +01:00
Markus Wang Halvorsen
5e10d53c36
Fix newlines in project descriptions
2018-02-13 16:28:59 +01:00
Yorin Anne De Jong
e93b07f890
Strange hack when using position:absolute
2018-02-13 16:11:14 +01:00
Yorin Anne De Jong
46eed1c223
Make navbar absolute positioned, so it scrolls
2018-02-13 16:07:28 +01:00
Yorin Anne De Jong
1e973c31b2
Concentrate position statement in one rule
2018-02-13 16:06:54 +01:00
Yorin Anne De Jong
84b6b60a37
Use CSS tables for the navbar
2018-02-13 16:01:19 +01:00
Markus Wang Halvorsen
774f2754a0
Remove rogue header tag
2018-02-13 15:51:57 +01:00
Markus Wang Halvorsen
89ce6773a8
Redo landing page main body
...
MOTD is WIP
2018-02-13 15:50:45 +01:00
Yorin Anne De Jong
1f2de139eb
Add McDonalds menu
2018-02-13 15:24:27 +01:00
Markus Wang Halvorsen
05dee57ded
Remove gender inequality
...
Got a complaint that the admin tools title wasn't very inclusive towards the fairer sex. The title has been edited to be gender neutral
2018-02-13 15:00:14 +01:00
Yorin Anne De Jong
2d850c719d
Make navbar darker and have fancy underline hover-effect
2018-02-13 14:53:51 +01:00
Yorin Anne De Jong
02f54c4458
Fix indentation for font CSS
2018-02-13 14:46:48 +01:00
Yorin Anne De Jong
39dfafd538
Revert "Add 32x32 favicon"
...
Some browsers take the 32x32 and scale it down to 16x16,
instead of taking the 16x16 sprite.
This reverts commit 6162e2662c
2018-02-12 00:08:51 +01:00
Yorin Anne De Jong
6162e2662c
Add 32x32 favicon
2018-02-11 02:48:55 +01:00
Peder Bergebakken Sundt
8a47ad96de
Fix sendmail bounce
2018-02-11 01:18:43 +01:00
Peder Bergebakken Sundt
61e7c73901
Fix db activities on frontpage without url
2018-02-11 01:01:05 +01:00
Peder Bergebakken Sundt
e98084aaf4
Remove /kurs
2018-02-10 18:38:09 +01:00
Peder Bergebakken Sundt
9f38e2af1a
Move agenda creation to single include
...
This is to minimize problems arizing from adding and removing recurring events
2018-02-10 18:37:02 +01:00
Yorin Anne De Jong
8b148fe0e3
Add 16x16 favicon
2018-02-10 18:34:09 +01:00
Yorin Anne De Jong
ebedc31fb6
Norwegian localisation fixes
2018-02-10 18:08:53 +01:00
Peder Bergebakken Sundt
25da4a80f2
Fix navbar on some pages
2018-02-10 18:05:38 +01:00
Peder Bergebakken Sundt
b914590ea8
Reduce the use of Raleways to headers and list items
2018-02-10 18:05:01 +01:00
Markus Wang Halvorsen
689428241c
Fix html for project pages
2018-02-10 16:39:30 +01:00
Markus Wang Halvorsen
0b0707eafe
Fix html for the rest of the main pages
2018-02-10 16:23:17 +01:00
Markus Wang Halvorsen
c4c5389fe8
Fix admin css
2018-02-10 16:13:18 +01:00
Markus Wang Halvorsen
56e6766520
Move navbar CSS to its own file
2018-02-10 15:04:57 +01:00
Peder Bergebakken Sundt
49048fc973
Add Raleway font as default
2018-01-31 01:23:45 +01:00
Markus Wang Halvorsen
b1623f9da1
Minor navbar adjustments
2017-11-14 11:40:28 +01:00
Markus Wang Halvorsen
1ea96f5c0d
New navbar
...
mobile still wip
2017-11-13 23:13:24 +01:00
Markus Wang Halvorsen
2ee9a98277
white logos
2017-11-13 22:01:33 +01:00
Peder Bergebakken Sundt
cf95f90f5e
A word
...
Totally not copy-pasted from the wiki
2017-11-13 20:43:10 +01:00
Peder Bergebakken Sundt
68f3bdb097
Add sane login button
2017-11-13 20:38:16 +01:00
Peder Bergebakken Sundt
7dbce0bd24
Add webmail to navbar, add generalized navbar to /om
2017-11-13 20:35:25 +01:00
Markus Wang Halvorsen
1f47b3849e
Landing changes i forgot to stage
...
im smart :)
2017-11-13 14:20:07 +01:00
Markus Wang Halvorsen
ede224c2f2
Move general info to landing header
2017-11-13 14:18:08 +01:00
Markus Wang Halvorsen
c6cd02486d
Redesign navbar and landing page
2017-11-13 13:21:51 +01:00
Peder Bergebakken Sundt
518ee8baf2
Started making /paamelding
2017-11-11 22:11:10 +01:00
Peder Bergebakken Sundt
5981eea827
Make parts of kalender non-selectable
2017-11-11 22:10:43 +01:00
Peder Bergebakken Sundt
f890b07d54
Minor cleanup in imports
2017-11-11 22:10:05 +01:00
Peder Bergebakken Sundt
d18315aa39
Fix https on simplesaml and remove /login
2017-11-11 22:08:24 +01:00
Markus Wang Halvorsen
689975f262
Admins can add new users to usergroup system
...
new users meaning users who aren't in the usergroup system for the website yet.
also spicier no access messages
2017-11-11 20:37:04 +01:00
Markus Wang Halvorsen
bb965aadd2
Admins can now set groups for new users
...
new users meaning users who don't already have any usergroups set
2017-11-11 19:13:59 +01:00
Markus Wang Halvorsen
9241a0404a
Only show buttons for admin pages you can access
2017-11-11 17:21:04 +01:00
Markus Wang Halvorsen
ee42e932e9
Fix requires for admin landing page
2017-11-11 17:15:02 +01:00
Markus Wang Halvorsen
3d3903eadc
Check usergroups when accessing admin panel
2017-11-11 17:06:56 +01:00
Markus Wang Halvorsen
1ce3490ff0
Usergroup system
2017-11-11 17:00:08 +01:00
Yorin Anne De Jong
6574bd576e
Generalize navigation and PHP configuration
2017-11-11 15:20:58 +01:00
Peder Bergebakken Sundt
9068042a7e
Remove "active" in navbar in adminpanel
2017-11-11 14:08:35 +01:00
Peder Bergebakken Sundt
eb62ce4d99
Fix navbar in /admin/prosjekter/
2017-11-11 13:55:01 +01:00
Peder Bergebakken Sundt
53d97b5ccd
Fix navbar in adminpanel
2017-10-28 20:55:40 +02:00
Peder Bergebakken Sundt
60ef214e1b
Fix bug displaying single prosjekt
2017-10-28 20:55:40 +02:00
Peder Bergebakken Sundt
c1def5fd7d
Pretty up admin and prosjekter
2017-10-28 20:55:40 +02:00
Markus Wang Halvorsen
e5dcb07659
My projects page
2017-10-28 20:09:54 +02:00
Markus Wang Halvorsen
446d966e80
Add simple login button & indicator to navbar
2017-10-28 17:19:40 +02:00
Markus Wang Halvorsen
7e3d256f93
Add project admin interface
2017-10-28 16:44:56 +02:00
Markus Wang Halvorsen
751967c5fa
Add filtering to activity admin page
2017-10-28 16:11:36 +02:00
Peder Bergebakken Sundt
e1b2f00a38
Fix projekter/ny navbar and header
2017-10-28 14:40:17 +02:00
Markus Wang Halvorsen
eb1adc0311
Restructure projects page
2017-10-28 14:01:49 +02:00
Markus Wang Halvorsen
1da1785e46
Add project creation
...
The projects page will also display a few random projects now
2017-10-22 17:57:55 +02:00
Yorin Anne De Jong
68bba332f1
Remove BrettspilActivity from agendas
2017-10-22 17:48:58 +02:00
Peder Bergebakken Sundt
731663e4c0
Fixed logout
2017-10-22 17:32:54 +02:00
Peder Bergebakken Sundt
d047a99fd3
Add simplesaml setup
2017-10-22 15:43:47 +02:00
Peder Bergebakken Sundt
473cd000d0
Remove url on simpleevent
2017-10-22 14:15:11 +02:00
Markus Wang Halvorsen
c7d4c6c524
Fix admin interface hrefs
2017-10-22 13:46:19 +02:00
Peder Bergebakken Sundt
2be094c905
Fix link to /kontakt/ in navbar
2017-10-22 13:34:53 +02:00
Markus Wang Halvorsen
1abb7813a8
Add event editing to admin interface
2017-10-12 00:38:28 +02:00
Markus Wang Halvorsen
d8f5dd4ad9
Split activities into pages in the admin interface
...
and other trivial fixes
2017-10-08 03:33:42 +02:00
Markus Wang Halvorsen
56f71eb9ab
Merge branch 'master' of https://github.com/Programvareverkstedet/nettsiden
2017-10-07 23:13:39 +02:00
Markus Wang Halvorsen
89c2a59fd6
Beginning of the admin interface
2017-10-07 23:12:10 +02:00
Peder Bergebakken Sundt
b30889dcca
Fix kalenderverkstedet title
2017-10-07 23:10:10 +02:00
Markus Wang Halvorsen
7cd78ac3bb
Merge branch 'master' of https://github.com/Programvareverkstedet/nettsiden
2017-10-07 23:10:01 +02:00
Peder Bergebakken Sundt
f7506d57da
Fix some norsk
2017-10-07 23:09:04 +02:00
Peder Bergebakken Sundt
aef3488c80
Make days clickable in kalender
2017-10-07 23:06:09 +02:00
Markus Wang Halvorsen
e6ad3fb47a
Remove ticker
2017-10-07 23:05:40 +02:00
Yorin Anne De Jong
34e09667e5
Let "aktiviteter" also show events from database
2017-10-07 22:21:30 +02:00
Peder Bergebakken Sundt
24678ffb11
Add kalender to navbar
2017-10-07 21:57:15 +02:00
Peder Bergebakken Sundt
93aaffd500
Add translation to kalender and append . to dates
2017-10-07 21:53:40 +02:00
Peder Bergebakken Sundt
a2703988f0
Add calendar
2017-10-07 21:26:49 +02:00
Peder Bergebakken Sundt
d89625558b
Remove bad joke
2017-10-07 21:26:49 +02:00
John Chen
a3c68c3c79
add feide authentication
2017-10-07 21:25:44 +02:00
John Chen
3d2f07418d
Merge branch 'master' of github.com:Programvareverkstedet/nettsiden
2017-10-07 19:42:18 +02:00
John Chen
c885e71ba0
New registration page, move some info from the old page to a separate 'om' page
2017-10-07 19:22:22 +02:00
Yorin Anne De Jong
acad759bb0
Move sosiale pictures back, fix regression
2017-10-07 17:34:27 +02:00
Yorin Anne De Jong
faff3a2a8d
Better alignment of date/time for today
2017-10-07 16:58:27 +02:00
Yorin Anne De Jong
0a2c08eb9b
Move date to the right
2017-10-07 16:42:11 +02:00
Yorin Anne De Jong
cd150d73c5
Cleanup code
2017-10-07 16:41:50 +02:00
Peder Bergebakken Sundt
8c8af74783
Move sosiale to aktiviteter
2017-10-07 15:16:22 +02:00
Peder Bergebakken Sundt
980e5ba9ac
Update title in prosjekter after its previous move
2017-10-07 15:05:11 +02:00
Peder Bergebakken Sundt
434d25cac5
Rename aktiviterer to prosjekter and hide prosjekter
2017-10-07 14:58:08 +02:00
Fredrik Lindberg Strupe
8feb9cc1ad
Remove duplicate file
2016-09-30 15:18:45 +02:00
Fredrik Lindberg Strupe
d0577fe62c
s/kommunikasjon/kontakt/g
2016-09-29 18:27:28 +02:00
Fredrik Lindberg Strupe
2fccac4f2d
Add comm tab to some more pages
2016-09-02 14:54:14 +02:00
Fredrik Lindberg Strupe
c0a892789e
Use common date formatter in sosiale page
2016-09-02 14:49:48 +02:00
Fredrik Lindberg Strupe
980d4018c2
Communication tab/page
2016-09-02 14:41:32 +02:00
Fredrik Lindberg Strupe
bc573a53c7
Image at brettspill page
2016-08-31 18:34:45 +02:00
Peder Bergebakken Sundt
4f1d3ee6b3
Updated navbar, added aktiviteter, deleted soek, made the ticker into an include
2016-08-30 18:13:31 +02:00
Yorin Anne De Jong
871ffc9182
Move navigation down in code, add ul element.
2016-08-29 19:37:49 +02:00
Yorin Anne De Jong
c7b297eeb9
Make headers appear black, even when they are links.
2016-08-29 18:30:07 +02:00
Yorin Anne De Jong
9ffaf26f1d
Remove "Remind Me" buttons.
2016-08-29 18:29:33 +02:00
Yorin Anne De Jong
db2ade9da0
Read kurs from database.
2016-08-29 18:27:31 +02:00
Yorin Anne De Jong
60cadc9284
Make description in HTML.
2016-08-29 18:24:21 +02:00
Yorin Anne De Jong
399d54b1c3
Make today activities green.
2016-08-27 00:14:12 +02:00
Yorin Anne De Jong
b8f71db554
Add image for brettspillkveld
2016-08-27 00:13:58 +02:00
Yorin Anne De Jong
d9ff461877
Remove redundant PHP close tag.
2016-08-26 23:56:06 +02:00
Yorin Anne De Jong
d19bd1d08b
Update links so that they can point to PHP files.
2016-08-26 23:54:58 +02:00
Fredrik Lindberg Strupe
1543363b10
Use tabs to make Yorn happy
2016-08-26 23:46:41 +02:00
Fredrik Lindberg Strupe
d56dfcab46
Fetch event description from event class
2016-08-26 23:31:44 +02:00
Yorin Anne De Jong
9d7a0d686f
Improve limit calculation for Social page.
2016-08-26 23:30:32 +02:00
Yorin Anne De Jong
ee000d2d67
Perfectionism.
2016-08-26 23:19:27 +02:00
Yorin Anne De Jong
b1266aa448
Set social activity text through class functions.
2016-08-26 23:18:14 +02:00
Fredrik Lindberg Strupe
f39389ead4
Global date formatting function
2016-08-26 23:14:46 +02:00
Fredrik Lindberg Strupe
a4787387dd
Show date status for nerdepitsa & animekveld
2016-08-26 22:58:20 +02:00
Fredrik Lindberg Strupe
a92f0af57a
Add brettspill page
2016-08-26 22:52:59 +02:00
Fredrik Lindberg Strupe
3e4c2d0ab1
Dynamic dates for animekveld page
2016-08-26 22:35:39 +02:00
Fredrik Lindberg Strupe
f83384d15f
Dynamic date on nerdepitsa event page
2016-08-26 22:23:58 +02:00
Peder Bergebakken Sundt
d7885ddfe6
Updated ticker to support multible events a day
2016-08-26 18:39:36 +02:00
Peder Bergebakken Sundt
e0fcf5f265
Merge branch 'master' of https://github.com/Programvareverkstedet/nettsiden
2016-08-26 17:49:53 +02:00
Peder Bergebakken Sundt
fab5827ebb
Fixed title in soek/ and added dev.bat
2016-08-26 17:49:29 +02:00
Yorin Anne De Jong
963973bc6b
Show upcoming activity in the header on the main page.
2016-08-26 17:29:09 +02:00
Yorin Anne De Jong
328a2a31e6
Add URL property to events.
2016-08-26 17:22:11 +02:00
Yorin Anne De Jong
8519c00a57
Show more relevant times in upcoming activities.
2016-08-26 17:05:19 +02:00
Yorin Anne De Jong
6c3ac94804
Remove macOS cruft.
2016-08-20 00:00:49 +02:00
Liang Zhu
b14c37c22b
added paamelding page
2016-08-19 23:47:48 +02:00
Liang Zhu
29f0afa31f
added brettspillkvled event
2016-08-19 23:46:30 +02:00
Yorin Anne De Jong
10fdc27b2b
New style for dates in "upcoming events".
2016-08-19 22:03:15 +02:00
Yorin Anne De Jong
2c1bc0a2cb
Add "next week" and show relative dates.
2016-08-19 22:01:25 +02:00
Yorin Anne De Jong
70db345b12
Remove duplicate PHP close tag.
2016-08-19 22:00:46 +02:00
Yorin Anne De Jong
3655883c9f
Write database configuration through dev-script.
2016-08-18 23:17:24 +02:00
Yorin Anne De Jong
72b3a1f535
Add PDO-activity for reading events from database.
2016-08-18 22:43:48 +02:00
Aleksander Gustaw Wasaznik
2949aba2bb
Autohyphenate <p>
...
Add hyphens:auto to <p> to remove the ugly gaps introduced by
text-align: justified. This may cause some unwanted hyphenation on e.g.
email addresses. We should strive to not have long unbreakable words.
For record; command for adding html tag to all relevant files:
$ find -type f -exec sed -i '/DOCTYPE/ a <html lang="no">' {} +
2016-08-18 09:45:30 +02:00
Liang Zhu
8ac5b801ef
added bli medlem page. updated sosiale page
2016-08-18 00:30:59 +02:00
Yorin Anne De Jong
2b5c561369
Add timezone statement to accommodate older PHP servers.
2016-08-18 00:00:34 +02:00
Yorin Anne De Jong
f91d62e69f
Remove merge cruft.
2016-08-17 23:58:54 +02:00
Yorin Anne De Jong
a4181b98ac
Fix typo.
2016-08-17 23:57:15 +02:00
Yorin Anne De Jong
b6970d3f03
Add automatic agenda on front page.
2016-08-17 23:57:15 +02:00
Fredrik Lindberg Strupe
e4e8b0972b
Dynamic event dates
2016-08-15 21:55:50 +02:00
Liang Zhu
6922cbeb23
Animekveld.
2016-08-15 21:12:30 +02:00
Karl August Høivik
4ac73d0113
Merge branch 'master' of github.com:Programvareverkstedet/nettsiden
2016-08-15 19:57:45 +02:00
Karl August Høivik
28397845a0
Event-getter classes
2016-08-15 19:57:27 +02:00
Peder Bergebakken Sundt
66c160ec40
Fikset wiki link, la til WIP søkeside
2016-08-15 19:30:45 +02:00
Karl August Høivik
2fc2dc4da5
PHP events start
2016-08-15 18:19:41 +02:00
Yorin Anne De Jong
a1a3d12409
Initial hacking.
2016-08-15 17:43:41 +02:00
