Style updates and misc fixes
This commit is contained in:
nikolark committed
1 parent
2b9ca26016
commit
213f87d918
9 files changed
+138
-19
No files matched your search
BIN
Binary file not shown.
|
Before Width: | Height: | Size: 0 B After Width: | Height: | Size: 117 KiB |
+1
-1
@@ -349,7 +349,7 @@ class User {
|
||||
|
||||
public function _validate() {
|
||||
$valid = true;
|
||||
if (!preg_match("/^[_a-z0-9-]+(\.[_a-z0-9-]+)*@[a-z0-9-]+(\.[a-z0-9-]+)*(\.[a-z]{2,3})$/i", $this->email)) {
|
||||
if( !valid_email($this->email) ) {
|
||||
notify("Ugyldig format på epostadresse.");
|
||||
$valid = false;
|
||||
}
|
||||
|
||||
+11
-11
@@ -75,7 +75,8 @@ if( isset($_POST['submit']) ) {
|
||||
<head>
|
||||
<meta charset="utf-8" />
|
||||
<meta name="viewport" content="width=device-width" />
|
||||
<title></title>
|
||||
<title>Aktiver medlemskapet ditt hos Det Norske Studentersamfund</title>
|
||||
<link href='http://fonts.googleapis.com/css?family=Arvo:700' rel='stylesheet' type='text/css'>
|
||||
<link rel="stylesheet" type="text/css" media="all" href="css/style.css" />
|
||||
|
||||
<!--<script src="js/jquery-1.11.0.js"></script>
|
||||
@@ -93,19 +94,18 @@ if( isset($_POST['submit']) ) {
|
||||
<div class="container">
|
||||
<h1 class="title">Aktiver medlemskapet ditt</h1>
|
||||
<header class="about">
|
||||
<p>Hei <strong><?php echo $user['firstname']; ?></strong>, du er veldig nære å kunne:</p>
|
||||
<p>Hei <strong><?php echo $user['firstname']." ".$user['lastname']; ?></strong>, du er veldig nære å kunne:</p>
|
||||
<ul class="incentives">
|
||||
<li>Få tilgang til din medlemskonto</li>
|
||||
<li>Få tilgang til medlemskontoen din</li>
|
||||
<li>Bruke trådløsnett på Chateau Neuf</li>
|
||||
<li>Bli aktiv på Studentersamfundet</li>
|
||||
</ul>
|
||||
<p>Fullfør profilen din ved å angi brukernavn og passord.</p>
|
||||
<p class="imperative">Fullfør profilen din ved å angi <em>brukernavn</em> og <em>passord</em>.</p>
|
||||
<h2>Din profil</h2>
|
||||
<ul class="profile">
|
||||
<!-- TODO: I bet firstname and lastname will be in iso8859-1 -->
|
||||
<li><strong>Navn</strong>: <?php echo $user['firstname']. " " .$user['lastname']; ?></li>
|
||||
<li><strong>E-post</strong>: <?php echo $user['email']; ?></li>
|
||||
<li><strong>Medlemsnummer</strong>: <?php echo $user['memberid']; ?></li>
|
||||
<li><strong>Navn:</strong><span class="profile-value"><?php echo $user['firstname']. " " .$user['lastname']; ?></span></li>
|
||||
<li><strong>E-post:</strong><span class="profile-value email-value"><?php echo $user['email']; ?></span></li>
|
||||
<li><strong>Medlemsnummer:</strong><span class="profile-value"><?php echo $user['memberid']; ?></span></li>
|
||||
</ul>
|
||||
</header>
|
||||
<section class="activation">
|
||||
@@ -122,12 +122,12 @@ if( isset($_POST['submit']) ) {
|
||||
<label for="id_username">Brukernavn:</label><input id="id_username" type="text" name="username" placeholder="Brukernavn" value="<?php echo $username; ?>" />
|
||||
<label for="id_password">Passord:</label><input id="id_password" type="password" name="password" placeholder="Passord" value="<?php echo $password; ?>"/>
|
||||
<label for="id_place_of_study">Studiested:</label><?php institutions(); ?>
|
||||
<label for="id_newsletter">Motta nyhetsbrev:</label><input type="checkbox" id="id_newsletter" name="newsletter" value="1"<?php echo $newsletter_checked; ?> /> Nyheter og kommende arrangementer på Studentersamfundet<br /><br />
|
||||
<button type="submit" name="submit" class="btn-submit">Aktiver medlemskapet</button>
|
||||
<label for="id_newsletter">Nyhetsbrev:</label><div class="newsletter-text"><input type="checkbox" id="id_newsletter" name="newsletter" value="1"<?php echo $newsletter_checked; ?> /><span>Nyheter og arrangementer</span></div>
|
||||
<button type="submit" name="submit" class="btn-submit">Aktiver medlemskapet mitt</button>
|
||||
</form>
|
||||
</section>
|
||||
<footer>
|
||||
<img src="https://brukerinfo.neuf.no/static/style/img/DNSlogo.png">
|
||||
<img src="/snapporder/img/logo.png" width="150" height="150">
|
||||
<img src="/snapporder/img/snapporder_logo_dark_liggende.png">
|
||||
</footer>
|
||||
</div>
|
||||
|
||||
@@ -1 +1 @@
|
||||
html{font-family:sans-serif;-ms-text-size-adjust:100%;-webkit-text-size-adjust:100%;}body{margin:0;}article,aside,details,figcaption,figure,footer,header,hgroup,main,nav,section,summary{display:block;}audio,canvas,progress,video{display:inline-block;vertical-align:baseline;}audio:not([controls]){display:none;height:0;}[hidden],template{display:none;}a{background:transparent;}a:active,a:hover{outline:0;}abbr[title]{border-bottom:1px dotted;}b,strong{font-weight:bold;}dfn{font-style:italic;}h1{font-size:2em;margin:0.67em 0;}mark{background:#ff0;color:#000;}small{font-size:80%;}sub,sup{font-size:75%;line-height:0;position:relative;vertical-align:baseline;}sup{top:-0.5em;}sub{bottom:-0.25em;}img{border:0;}svg:not(:root){overflow:hidden;}figure{margin:1em 40px;}hr{-moz-box-sizing:content-box;-webkit-box-sizing:content-box;box-sizing:content-box;height:0;}pre{overflow:auto;}code,kbd,pre,samp{font-family:monospace,monospace;font-size:1em;}button,input,optgroup,select,textarea{color:inherit;font:inherit;margin:0;}button{overflow:visible;}button,select{text-transform:none;}button,html input[type="button"],input[type="reset"],input[type="submit"]{-webkit-appearance:button;cursor:pointer;}button[disabled],html input[disabled]{cursor:default;}button::-moz-focus-inner,input::-moz-focus-inner{border:0;padding:0;}input{line-height:normal;}input[type="checkbox"],input[type="radio"]{-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box;padding:0;}input[type="number"]::-webkit-inner-spin-button,input[type="number"]::-webkit-outer-spin-button{height:auto;}input[type="search"]{-webkit-appearance:textfield;-moz-box-sizing:content-box;-webkit-box-sizing:content-box;box-sizing:content-box;}input[type="search"]::-webkit-search-cancel-button,input[type="search"]::-webkit-search-decoration{-webkit-appearance:none;}fieldset{border:1px solid #c0c0c0;margin:0 2px;padding:0.35em 0.625em 0.75em;}legend{border:0;padding:0;}textarea{overflow:auto;}optgroup{font-weight:bold;}table{border-collapse:collapse;border-spacing:0;}td,th{padding:0;}meta.foundation-version{font-family:"/5.2.3/";}meta.foundation-mq-small{font-family:"/only screen/";width:0em;}meta.foundation-mq-medium{font-family:"/only screen and (min-width:40.063em)/";width:40.063em;}meta.foundation-mq-large{font-family:"/only screen and (min-width:64.063em)/";width:64.063em;}meta.foundation-mq-xlarge{font-family:"/only screen and (min-width:90.063em)/";width:90.063em;}meta.foundation-mq-xxlarge{font-family:"/only screen and (min-width:120.063em)/";width:120.063em;}meta.foundation-data-attribute-namespace{font-family:false;}html,body{height:100%;}*,*:before,*:after{-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box;}html,body{font-size:100%;}body{background:#fff;color:#222;padding:0;margin:0;font-family:"Helvetica Neue","Helvetica",Helvetica,Arial,sans-serif;font-weight:normal;font-style:normal;line-height:1;position:relative;cursor:default;}a:hover{cursor:pointer;}img{max-width:100%;height:auto;}img{-ms-interpolation-mode:bicubic;}#map_canvas img,#map_canvas embed,#map_canvas object,.map_canvas img,.map_canvas embed,.map_canvas object{max-width:none !important;}.left{float:left !important;}.right{float:right !important;}.clearfix:before,.clearfix:after{content:" ";display:table;}.clearfix:after{clear:both;}.hide{display:none;}.antialiased{-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale;}img{display:inline-block;vertical-align:middle;}textarea{height:auto;min-height:50px;}select{width:100%;}.row{width:100%;margin-left:auto;margin-right:auto;margin-top:0;margin-bottom:0;max-width:62.5rem;}.row:before,.row:after{content:" ";display:table;}.row:after{clear:both;}.row.collapse>.column,.row.collapse>.columns{padding-left:0;padding-right:0;}.row.collapse .row{margin-left:0;margin-right:0;}.row .row{width:auto;margin-left:-0.9375rem;margin-right:-0.9375rem;margin-top:0;margin-bottom:0;max-width:none;}.row .row:before,.row .row:after{content:" ";display:table;}.row .row:after{clear:both;}.row .row.collapse{width:auto;margin:0;max-width:none;}.row .row.collapse:before,.row .row.collapse:after{content:" ";display:table;}.row .row.collapse:after{clear:both;}.column,.columns{padding-left:0.9375rem;padding-right:0.9375rem;width:100%;float:left;}@media only screen{.small-push-0{position:relative;left:0%;right:auto;}.small-pull-0{position:relative;right:0%;left:auto;}.small-push-1{position:relative;left:8.33333%;right:auto;}.small-pull-1{position:relative;right:8.33333%;left:auto;}.small-push-2{position:relative;left:16.66667%;right:auto;}.small-pull-2{position:relative;right:16.66667%;left:auto;}.small-push-3{position:relative;left:25%;right:auto;}.small-pull-3{position:relative;right:25%;left:auto;}.small-push-4{position:relative;left:33.33333%;right:auto;}.small-pull-4{position:relative;right:33.33333%;left:auto;}.small-push-5{position:relative;left:41.66667%;right:auto;}.small-pull-5{position:relative;right:41.66667%;leLine truncated
|
||||
/*! normalize.css v3.0.1 | MIT License | git.io/normalize */html{font-family:sans-serif;-ms-text-size-adjust:100%;-webkit-text-size-adjust:100%;}body{margin:0;}article,aside,details,figcaption,figure,footer,header,hgroup,main,nav,section,summary{display:block;}audio,canvas,progress,video{display:inline-block;vertical-align:baseline;}audio:not([controls]){display:none;height:0;}[hidden],template{display:none;}a{background:transparent;}a:active,a:hover{outline:0;}abbr[title]{border-bottom:1px dotted;}b,strong{font-weight:bold;}dfn{font-style:italic;}h1{font-size:2em;margin:0.67em 0;}mark{background:#ff0;color:#000;}small{font-size:80%;}sub,sup{font-size:75%;line-height:0;position:relative;vertical-align:baseline;}sup{top:-0.5em;}sub{bottom:-0.25em;}img{border:0;}svg:not(:root){overflow:hidden;}figure{margin:1em 40px;}hr{-moz-box-sizing:content-box;-webkit-box-sizing:content-box;box-sizing:content-box;height:0;}pre{overflow:auto;}code,kbd,pre,samp{font-family:monospace,monospace;font-size:1em;}button,input,optgroup,select,textarea{color:inherit;font:inherit;margin:0;}button{overflow:visible;}button,select{text-transform:none;}button,html input[type="button"],input[type="reset"],input[type="submit"]{-webkit-appearance:button;cursor:pointer;}button[disabled],html input[disabled]{cursor:default;}button::-moz-focus-inner,input::-moz-focus-inner{border:0;padding:0;}input{line-height:normal;}input[type="checkbox"],input[type="radio"]{-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box;padding:0;}input[type="number"]::-webkit-inner-spin-button,input[type="number"]::-webkit-outer-spin-button{height:auto;}input[type="search"]{-webkit-appearance:textfield;-moz-box-sizing:content-box;-webkit-box-sizing:content-box;box-sizing:content-box;}input[type="search"]::-webkit-search-cancel-button,input[type="search"]::-webkit-search-decoration{-webkit-appearance:none;}fieldset{border:1px solid #c0c0c0;margin:0 2px;padding:0.35em 0.625em 0.75em;}legend{border:0;padding:0;}textarea{overflow:auto;}optgroup{font-weight:bold;}table{border-collapse:collapse;border-spacing:0;}td,th{padding:0;}meta.foundation-version{font-family:"/5.2.3/";}meta.foundation-mq-small{font-family:"/only screen/";width:0em;}meta.foundation-mq-medium{font-family:"/only screen and (min-width:40.063em)/";width:40.063em;}meta.foundation-mq-large{font-family:"/only screen and (min-width:64.063em)/";width:64.063em;}meta.foundation-mq-xlarge{font-family:"/only screen and (min-width:90.063em)/";width:90.063em;}meta.foundation-mq-xxlarge{font-family:"/only screen and (min-width:120.063em)/";width:120.063em;}meta.foundation-data-attribute-namespace{font-family:false;}html,body{height:100%;}*,*:before,*:after{-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box;}html,body{font-size:100%;}body{background:#fff;color:#222;padding:0;margin:0;font-family:"Helvetica Neue","Helvetica",Helvetica,Arial,sans-serif;font-weight:normal;font-style:normal;line-height:1;position:relative;cursor:default;}a:hover{cursor:pointer;}img{max-width:100%;height:auto;}img{-ms-interpolation-mode:bicubic;}#map_canvas img,#map_canvas embed,#map_canvas object,.map_canvas img,.map_canvas embed,.map_canvas object{max-width:none !important;}.left{float:left !important;}.right{float:right !important;}.clearfix:before,.clearfix:after{content:" ";display:table;}.clearfix:after{clear:both;}.hide{display:none;}.antialiased{-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale;}img{display:inline-block;vertical-align:middle;}textarea{height:auto;min-height:50px;}select{width:100%;}.row{width:100%;margin-left:auto;margin-right:auto;margin-top:0;margin-bottom:0;max-width:62.5rem;}.row:before,.row:after{content:" ";display:table;}.row:after{clear:both;}.row.collapse>.column,.row.collapse>.columns{padding-left:0;padding-right:0;}.row.collapse .row{margin-left:0;margin-right:0;}.row .row{width:auto;margin-left:-0.9375rem;margin-right:-0.9375rem;margin-top:0;margin-bottom:0;max-width:none;}.row .row:before,.row .row:after{content:" ";display:table;}.row .row:after{clear:both;}.row .row.collapse{width:auto;margin:0;max-width:none;}.row .row.collapse:before,.row .row.collapse:after{content:" ";display:table;}.row .row.collapse:after{clear:both;}.column,.columns{padding-left:0.9375rem;padding-right:0.9375rem;width:100%;float:left;}@media only screen{.small-push-0{position:relative;left:0%;right:auto;}.small-pull-0{position:relative;right:0%;left:auto;}.small-push-1{position:relative;left:8.3333333333%;right:auto;}.small-pull-1{position:relative;right:8.3333333333%;left:auto;}.small-push-2{position:relative;left:16.6666666667%;right:auto;}.small-pull-2{position:relative;right:16.6666666667%;left:auto;}.small-push-3{position:relative;left:25%;right:auto;}.small-pull-3{position:relative;right:25%;left:auto;}.small-push-4{position:relative;left:33.3333333333%;right:auto;}.small-pull-4{position:relative;right:33.3333333333%;left:auto;}.small-push-5{positLine truncated
|
||||
Binary file not shown.
|
After Width: | Height: | Size: 85 B |
Binary file not shown.
|
After Width: | Height: | Size: 6.7 KiB |
+121
-2
@@ -10,24 +10,105 @@
|
||||
@import "foundation/components/visibility";
|
||||
|
||||
body {
|
||||
line-height: 1.4;
|
||||
font-family: Arial, sans-serif;
|
||||
|
||||
h1, h2, h3, h4, h5, h6 {
|
||||
margin: 0;
|
||||
margin-top: rem-calc(10);
|
||||
font-family: Arvo, sans-serif;
|
||||
|
||||
}
|
||||
ul {
|
||||
margin: 0;
|
||||
padding: 0;
|
||||
padding-left: rem-calc(20);
|
||||
padding-top: rem-calc(8);
|
||||
}
|
||||
p {
|
||||
margin: 0;
|
||||
margin-top: rem-calc(10);
|
||||
}
|
||||
}
|
||||
.container {
|
||||
@include grid-row();
|
||||
margin-top: rem-calc(10);
|
||||
}
|
||||
.title {
|
||||
@include grid-column(12);
|
||||
}
|
||||
.about{
|
||||
.about {
|
||||
@include grid-column(12);
|
||||
@media #{$medium-up} { @include grid-column(6); }
|
||||
}
|
||||
.profile {
|
||||
padding-left: 0;
|
||||
|
||||
li {
|
||||
list-style: none;
|
||||
border-bottom: 1px solid #ccc;
|
||||
line-height: rem-calc(40);
|
||||
}
|
||||
strong {
|
||||
display: inline-block;
|
||||
width: 30%;
|
||||
color: #4d4d4d;
|
||||
}
|
||||
.profile-value {
|
||||
display: inline-block;
|
||||
width: 70%;
|
||||
text-align: right;
|
||||
}
|
||||
}
|
||||
.activation {
|
||||
@include grid-column(12);
|
||||
@media #{$medium-up} { @include grid-column(6); }
|
||||
.profile {
|
||||
|
||||
span.error {
|
||||
margin-bottom: 0;
|
||||
}
|
||||
|
||||
.activation-form {
|
||||
label {
|
||||
font-weight: bold;
|
||||
display: inline-block;
|
||||
width: 30%;
|
||||
border-bottom: 1px solid #ccc;
|
||||
line-height: rem-calc(40);
|
||||
}
|
||||
input[type=text],
|
||||
input[type=password] {
|
||||
display: inline-block;
|
||||
width: 70%;
|
||||
background-color: white;
|
||||
border: 0;
|
||||
text-shadow: none;
|
||||
box-shadow: none;
|
||||
height: rem-calc(40);
|
||||
margin: 0;
|
||||
border-bottom: 1px solid #ccc;
|
||||
}
|
||||
select {
|
||||
display: inline-block;
|
||||
width: 70%;
|
||||
background-color: white;
|
||||
border: 0;
|
||||
border-bottom: 1px solid #ccc;
|
||||
padding-left: 0;
|
||||
height: rem-calc(40);
|
||||
outline: 0;
|
||||
margin: 0;
|
||||
}
|
||||
.newsletter-text {
|
||||
display: inline-block;
|
||||
width: 70%;
|
||||
border-bottom: 1px solid #ccc;
|
||||
height: rem-calc(32);
|
||||
input {
|
||||
margin: 0;
|
||||
margin-right: 4px;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
.btn-submit {
|
||||
@@ -44,4 +125,42 @@ body {
|
||||
#id_date_of_birth_year {
|
||||
width: 33.333333%;
|
||||
}
|
||||
$green: lighten(#2AA82A, 10%);
|
||||
|
||||
.btn-submit {
|
||||
font-family: Arial, sans-serif;
|
||||
color: darken($green, 30%);
|
||||
font-weight: bold;
|
||||
font-size: 20px;
|
||||
padding: 0.8em 1.2em;
|
||||
border: none;
|
||||
background: $green url('../img/gradient.png') repeat-x bottom left;
|
||||
text-shadow: 0 1px 0 rgba(255, 255, 255, 0.5);
|
||||
border: 1px solid darken($green, 10%);
|
||||
display: inline-block;
|
||||
box-shadow: 0 1px 0 rgba(17, 73, 17, 0.1), 0 1px 0 lighten($green, 10%) inset;
|
||||
text-align: center;
|
||||
border-radius: 6px;
|
||||
margin: 0;
|
||||
margin-top: rem-calc(16);
|
||||
|
||||
&:hover,
|
||||
&:focus {
|
||||
background-color: lighten($green, 10%);
|
||||
color: darken($green, 20%);
|
||||
}
|
||||
}
|
||||
|
||||
footer {
|
||||
@include grid-column(12);
|
||||
text-align: center;
|
||||
}
|
||||
|
||||
header,
|
||||
.about,
|
||||
.activation {
|
||||
@media #{$small-only} {
|
||||
//padding-left: 0;
|
||||
//padding-right: 0;
|
||||
}
|
||||
}
|
||||
Whitespace-only changes.
@@ -1,7 +1,7 @@
|
||||
{
|
||||
"firstname": "Test",
|
||||
"lastname": "Testesen",
|
||||
"email": "aaaadadfz@aaa422asd333a44zz.com",
|
||||
"firstname": "Üve",
|
||||
"lastname": "Bårdvigsen",
|
||||
"email": "aaaadadfz@aaa422asd333a44za.com",
|
||||
"birthdate": "1985-02-05",
|
||||
"phone": "+4745115784"
|
||||
"phone": "+4745115787"
|
||||
}
|
||||
Reference in new issue
Block a user