From dafbcec22c127fe83255ece4bc9faaa0051ddb36 Mon Sep 17 00:00:00 2001 From: Nikolai Kristiansen Date: Sun, 27 Nov 2011 04:07:00 +0100 Subject: [PATCH] Adds basic styling (using compass, sass and bp) --- .gitignore | 2 +- static/css/style.css | 0 static/style/config.rb | 24 ++++++ static/style/images/grid.png | Bin 0 -> 206 bytes static/style/sass/ie.scss | 16 ++++ static/style/sass/partials/_base.scss | 20 +++++ static/style/sass/partials/_col.scss | 57 ++++++++++++++ static/style/sass/partials/_form.scss | 6 ++ static/style/sass/partials/_page.scss | 22 ++++++ static/style/sass/print.scss | 5 ++ static/style/sass/screen.scss | 43 +++++++++++ static/style/stylesheets/ie.css | 1 + static/style/stylesheets/print.css | 1 + static/style/stylesheets/screen.css | 1 + templates/base.html | 15 +++- templates/private/profile.html | 73 ++++++++++-------- .../registration/password_change_form.html | 6 +- .../registration/password_reset_form.html | 4 +- 18 files changed, 257 insertions(+), 39 deletions(-) delete mode 100644 static/css/style.css create mode 100644 static/style/config.rb create mode 100644 static/style/images/grid.png create mode 100644 static/style/sass/ie.scss create mode 100644 static/style/sass/partials/_base.scss create mode 100644 static/style/sass/partials/_col.scss create mode 100644 static/style/sass/partials/_form.scss create mode 100644 static/style/sass/partials/_page.scss create mode 100644 static/style/sass/print.scss create mode 100644 static/style/sass/screen.scss create mode 100644 static/style/stylesheets/ie.css create mode 100644 static/style/stylesheets/print.css create mode 100644 static/style/stylesheets/screen.css diff --git a/.gitignore b/.gitignore index 9e3cf82..1935142 100644 --- a/.gitignore +++ b/.gitignore @@ -2,4 +2,4 @@ *.pyc settings.py test.db - +static/style/.sass-cache/ diff --git a/static/css/style.css b/static/css/style.css deleted file mode 100644 index e69de29..0000000 diff --git a/static/style/config.rb b/static/style/config.rb new file mode 100644 index 0000000..148088b --- /dev/null +++ b/static/style/config.rb @@ -0,0 +1,24 @@ +# Require any additional compass plugins here. + +# Set this to the root of your project when deployed: +http_path = "/" +css_dir = "stylesheets" +sass_dir = "sass" +images_dir = "images" +javascripts_dir = "javascripts" + +# You can select your preferred output style here (can be overridden via the command line): +# output_style = :expanded or :nested or :compact or :compressed + +# To enable relative paths to assets via compass helper functions. Uncomment: +# relative_assets = true + +# To disable debugging comments that display the original location of your selectors. Uncomment: +# line_comments = false + + +# If you prefer the indented syntax, you might want to regenerate this +# project again passing --syntax sass, or you can uncomment this: +# preferred_syntax = :sass +# and then run: +# sass-convert -R --from scss --to sass sass scss && rm -rf sass && mv scss sass diff --git a/static/style/images/grid.png b/static/style/images/grid.png new file mode 100644 index 0000000000000000000000000000000000000000..129d4a29fbe92688aabed5638e0c4f73a7bca818 GIT binary patch literal 206 zcmeAS@N?(olHy`uVBq!ia0vp^8bB<>!3HEX<>xE|QY^(zo*^7SP{WbZ0pxQQctjR6 zFmQbUVMeDlCNqG7G9|7NCBgY=CFO}lsSJ)O`AMk?Zka`?<@rU~#R|^B#xt(DF$2|k zc)B=-cyuP$eEj#lzKxOL5tEL~%H%~Gtu@#d^DPnSv6>KM@XEpK;0k6FVdQ&MBb@06Zo?vj6}9 literal 0 HcmV?d00001 diff --git a/static/style/sass/ie.scss b/static/style/sass/ie.scss new file mode 100644 index 0000000..a867281 --- /dev/null +++ b/static/style/sass/ie.scss @@ -0,0 +1,16 @@ +@import "blueprint"; + +// To generate css equivalent to the blueprint css but with your configuration applied, uncomment: +// +blueprint-ie + +//Recommended Blueprint configuration with scoping and semantic layout: +body.bp { + @include blueprint-ie(true); + // Note: Blueprint centers text to fix IE6 container centering. + // This means all your texts will be centered under all version of IE by default. + // If your container does not have the .container class, don't forget to restore + // the correct behavior to your main container (but not the body tag!) + // Example: + // .my-container + // text-align: left +} diff --git a/static/style/sass/partials/_base.scss b/static/style/sass/partials/_base.scss new file mode 100644 index 0000000..1c865fc --- /dev/null +++ b/static/style/sass/partials/_base.scss @@ -0,0 +1,20 @@ +// Here is where you can define your constants for your application and to configure the blueprint framework. +// Feel free to delete these if you want keep the defaults: + +$blueprint-grid-columns: 24; +$blueprint-container-size: 950px; +$blueprint-grid-margin: 10px; + +// Use this to calculate the width based on the total width. +// Or you can set $blueprint-grid-width to a fixed value and unset $blueprint-container-size -- it will be calculated for you. +$blueprint-grid-width: ($blueprint-container-size + $blueprint-grid-margin) / $blueprint-grid-columns - $blueprint-grid-margin; + +$blueprint-font-size: 16px; +$blueprint-background-color: #dadadc; +//$font-color:#F09321; +$container-background-color: #fff; +$container-shadow-color: darken($blueprint-background-color, 40%); +$section-background-color: #fff; +$section-hover-color: darken($container-background-color, 3%); +$section-border-color: darken($section-background-color, 20%); + diff --git a/static/style/sass/partials/_col.scss b/static/style/sass/partials/_col.scss new file mode 100644 index 0000000..46075e9 --- /dev/null +++ b/static/style/sass/partials/_col.scss @@ -0,0 +1,57 @@ +// Page layout can be done using mixins applied to your semantic classes and IDs +// For instance this layout defines a two column layout on pages with +// a body class of "two-col". +// +// The markup would look like: +//
+// +// +//
+// +//
+// +// and the layout would look like: +// +------------------------+ +// | #header | +// +--------+---------------+ +// | | | +// |#sidebar| #content | +// | | | +// +------------------------+ +// | #footer | +// +--------+---------------+ + +body.two-col { + #container { + @include container; } + #header, #footer { + @include column($blueprint-grid-columns); } + #sidebar { + // One third of the grid columns, rounding down. With 24 cols, this is 8. + $sidebar-columns: floor($blueprint-grid-columns / 3); + @include column($sidebar-columns); } + #content { + // Two thirds of the grid columns, rounding up. + // With 24 cols, this is 16. + $content-columns: ceil(2 * $blueprint-grid-columns / 3); + // true means it's the last column in the row + @include column($content-columns, true); } } + +body.three-col { + #container { + @include container; + } + #header, #footer { + @include column($blueprint-grid-columns); + } + section.column { + // One third of the grid columns + $sidebar-columns: $blueprint-grid-columns / 3; + @include column($sidebar-columns); + } + section.column.last { + // true means last + $sidebar-columns: $blueprint-grid-columns / 3 - 1; + @include column($sidebar-columns, true); + } +} diff --git a/static/style/sass/partials/_form.scss b/static/style/sass/partials/_form.scss new file mode 100644 index 0000000..8cfade0 --- /dev/null +++ b/static/style/sass/partials/_form.scss @@ -0,0 +1,6 @@ +// Only apply the blueprint form styles to forms with +// a class of "bp". This makes it easier to style +// forms from scratch if you need to. + +form.bp { + @include blueprint-form; } diff --git a/static/style/sass/partials/_page.scss b/static/style/sass/partials/_page.scss new file mode 100644 index 0000000..e75556c --- /dev/null +++ b/static/style/sass/partials/_page.scss @@ -0,0 +1,22 @@ +// Import the non-default scaffolding module to help us get started. +@import "blueprint/scaffolding"; + +// This configuration will only apply the +// blueprint styles to pages with a body class of "bp" +// This makes it easier to have pages without blueprint styles +// when you're using a single/combined stylesheet. +@import "compass/typography/lists/inline-list"; +@import "compass/typography/lists/inline-block-list"; +@import "compass/css3/text-shadow"; +@import "blueprint/liquid"; + +body.bp { + @include blueprint-typography(true); + @include blueprint-utilities; + @include blueprint-debug; + @include blueprint-interaction; + // Remove the scaffolding when you're ready to start doing visual design. + // Or leave it in if you're happy with how blueprint looks out-of-the-box + @include blueprint-scaffolding; + +} diff --git a/static/style/sass/print.scss b/static/style/sass/print.scss new file mode 100644 index 0000000..0677297 --- /dev/null +++ b/static/style/sass/print.scss @@ -0,0 +1,5 @@ +@import "blueprint"; + +//Recommended Blueprint configuration with scoping and semantic layout: +body.bp { + @include blueprint-print(true); } diff --git a/static/style/sass/screen.scss b/static/style/sass/screen.scss new file mode 100644 index 0000000..c76b474 --- /dev/null +++ b/static/style/sass/screen.scss @@ -0,0 +1,43 @@ +// This import applies a global reset to any page that imports this stylesheet. +@import "blueprint/reset"; + +// To configure blueprint, edit the partials/base.sass file. +@import "partials/base"; + +// Import all the default blueprint modules so that we can access their mixins. +@import "blueprint"; + +// Combine the partials into a single screen stylesheet. +@import "partials/page"; +@import "partials/form"; +@import "partials/_col"; +@import "compass/css3"; + +body { + background-color: $blueprint-background-color; + #header { + padding-bottom:40px; + } + #container { + padding:10px; + background-color:$container-background-color; + @include box-shadow($container-shadow-color 2px 2px 6px); + @include border-radius(10px); + + nav { + ul { + @include inline-block-list; + } + } + + section { + background-color:$section-background-color; + border: solid 1px $section-border-color; + @include border-radius(6px); + min-height:170px; + &:hover { + background-color:$section-hover-color; + } + } + } +} diff --git a/static/style/stylesheets/ie.css b/static/style/stylesheets/ie.css new file mode 100644 index 0000000..a330fe8 --- /dev/null +++ b/static/style/stylesheets/ie.css @@ -0,0 +1 @@ +body.bp{text-align:center}* html body.bp legend{margin:0px -8px 16px 0;padding:0}html > body.bp p code{*white-space:normal}body.bp .container{text-align:left}body.bp sup{vertical-align:text-top}body.bp sub{vertical-align:text-bottom}body.bp hr{margin:-8px auto 11px}body.bp img{-ms-interpolation-mode:bicubic}body.bp fieldset{padding-top:0}body.bp legend{margin-top:-0.2em;margin-bottom:1em;margin-left:-0.5em}body.bp fieldset,body.bp #IE8#HACK{padding-top:1.4em}body.bp legend,body.bp #IE8#HACK{margin-top:0;margin-bottom:0}body.bp textarea{overflow:auto}body.bp label{position:relative;top:-0.25em}body.bp input.text{margin:0.5em 0;background-color:white;border:1px solid #bbbbbb}body.bp input.text:focus{border:1px solid #666666}body.bp input.title{margin:0.5em 0;background-color:white;border:1px solid #bbbbbb}body.bp input.title:focus{border:1px solid #666666}body.bp input.checkbox{position:relative;top:0.25em}body.bp input.radio{position:relative;top:0.25em}body.bp input.button{position:relative;top:0.25em}body.bp textarea{margin:0.5em 0}body.bp select{margin:0.5em 0}body.bp button{position:relative;top:0.25em} diff --git a/static/style/stylesheets/print.css b/static/style/stylesheets/print.css new file mode 100644 index 0000000..c7f3e5a --- /dev/null +++ b/static/style/stylesheets/print.css @@ -0,0 +1 @@ +body.bp{line-height:1.5;font-family:"Helvetica Neue",Arial,Helvetica,sans-serif;color:black;background:none;font-size:10pt}body.bp .container{background:none}body.bp hr{background:#cccccc;color:#cccccc;width:100%;height:2px;margin:2em 0;padding:0;border:none}body.bp hr.space{background:white;color:white}body.bp h1,body.bp h2,body.bp h3,body.bp h4,body.bp h5,body.bp h6{font-family:"Helvetica Neue",Arial,Helvetica,sans-serif}body.bp code{font-size:0.9em;font-family:"andale mono","lucida console",monospace}body.bp a img{border:none}body.bp a:link,body.bp a:visited{background:transparent;font-weight:700;text-decoration:underline}body.bp p img.top{margin-top:0}body.bp blockquote{margin:1.5em;padding:1em;font-style:italic;font-size:0.9em}body.bp .small{font-size:0.9em}body.bp .large{font-size:1.1em}body.bp .quiet{color:#999999}body.bp .hide{display:none} diff --git a/static/style/stylesheets/screen.css b/static/style/stylesheets/screen.css new file mode 100644 index 0000000..e34b5f9 --- /dev/null +++ b/static/style/stylesheets/screen.css @@ -0,0 +1 @@ +html{margin:0;padding:0;border:0}.bp-reset-element,body,h1,h2,h3,h4,h5,h6,article,aside,details,figcaption,figure,footer,header,hgroup,menu,nav,section,summary,blockquote,q,th,td,caption,table,div,span,object,iframe,p,pre,a,abbr,acronym,address,code,del,dfn,em,img,dl,dt,dd,ol,ul,li,fieldset,form,label,legend,caption,tbody,tfoot,thead,tr{margin:0;padding:0;border:0;font-weight:inherit;font-style:inherit;font-size:100%;font-family:inherit;vertical-align:baseline}article,aside,details,figcaption,figure,footer,header,hgroup,menu,nav,section,summary{display:block}blockquote,q{quotes:"" ""}blockquote:before,blockquote:after,q:before,q:after{content:""}th,td,caption{float:none !important;text-align:left;font-weight:normal;vertical-align:middle}table{border-collapse:separate;border-spacing:0;vertical-align:middle}a img{border:none}body.bp{line-height:1.5;font-family:"Helvetica Neue",Arial,Helvetica,sans-serif;color:#333;font-size:100%}body.bp h1,body.bp h2,body.bp h3,body.bp h4,body.bp h5,body.bp h6{font-weight:normal;color:#222}body.bp h1 img,body.bp h2 img,body.bp h3 img,body.bp h4 img,body.bp h5 img,body.bp h6 img{margin:0}body.bp h1{font-size:3em;line-height:1;margin-bottom:0.50em}body.bp h2{font-size:2em;margin-bottom:0.75em}body.bp h3{font-size:1.5em;line-height:1;margin-bottom:1.00em}body.bp h4{font-size:1.2em;line-height:1.25;margin-bottom:1.25em}body.bp h5{font-size:1em;font-weight:bold;margin-bottom:1.50em}body.bp h6{font-size:1em;font-weight:bold}body.bp p{margin:0 0 1.5em}body.bp p .left{display:inline;float:left;margin:1.5em 1.5em 1.5em 0;padding:0}body.bp p .right{display:inline;float:right;margin:1.5em 0 1.5em 1.5em;padding:0}body.bp a{text-decoration:underline;color:#06c}body.bp a:visited{color:#004c99}body.bp a:focus{color:#09f}body.bp a:hover{color:#09f}body.bp a:active{color:#bf00ff}body.bp blockquote{margin:1.5em;color:#666;font-style:italic}body.bp strong,body.bp dfn{font-weight:bold}body.bp em,body.bp dfn{font-style:italic}body.bp sup,body.bp sub{line-height:0}body.bp abbr,body.bp acronym{border-bottom:1px dotted #666666}body.bp address{margin:0 0 1.5em;font-style:italic}body.bp del{color:#666}body.bp pre{margin:1.5em 0;white-space:pre}body.bp pre,body.bp code,body.bp tt{font:1em "andale mono","lucida console",monospace;line-height:1.5}body.bp li ul,body.bp li ol{margin:0}body.bp ul,body.bp ol{margin:0 1.5em 1.5em 0;padding-left:1.5em}body.bp ul{list-style-type:disc}body.bp ol{list-style-type:decimal}body.bp dl{margin:0 0 1.5em 0}body.bp dl dt{font-weight:bold}body.bp dd{margin-left:1.5em}body.bp table{margin-bottom:1.4em;width:100%}body.bp th{font-weight:bold}body.bp thead th{background:#c3d9ff}body.bp th,body.bp td,body.bp caption{padding:4px 10px 4px 5px}body.bp table.striped tr:nth-child(even) td,body.bp table tr.even td{background:#e5ecf9}body.bp tfoot{font-style:italic}body.bp caption{background:#dadadc}body.bp .quiet{color:#666}body.bp .loud{color:#111}body.bp .clear{clear:both}body.bp .nowrap{white-space:nowrap}body.bp .clearfix{overflow:hidden;*zoom:1}body.bp .small{font-size:0.8em;margin-bottom:1.875em;line-height:1.875em}body.bp .large{font-size:1.2em;line-height:2.5em;margin-bottom:1.25em}body.bp .first{margin-left:0;padding-left:0}body.bp .last{margin-right:0;padding-right:0}body.bp .top{margin-top:0;padding-top:0}body.bp .bottom{margin-bottom:0;padding-bottom:0}body.bp .showgrid{background-image:-webkit-gradient(linear, 50% 100%, 50% 0%, color-stop(5%, rgba(0,0,0,0.5)), color-stop(5%, rgba(0,0,0,0))),-webkit-gradient(linear, 0% 50%, 960 50%, color-stop(0%, rgba(0,0,0,0)), color-stop(0%, rgba(100,100,225,0.25)), color-stop(3.125%, rgba(100,100,225,0.25)), color-stop(3.125%, rgba(0,0,0,0)), color-stop(4.167%, rgba(0,0,0,0)), color-stop(4.167%, rgba(100,100,225,0.25)), color-stop(7.292%, rgba(100,100,225,0.25)), color-stop(7.292%, rgba(0,0,0,0)), color-stop(8.333%, rgba(0,0,0,0)), color-stop(8.333%, rgba(100,100,225,0.25)), color-stop(11.458%, rgba(100,100,225,0.25)), color-stop(11.458%, rgba(0,0,0,0)), color-stop(12.5%, rgba(0,0,0,0)), color-stop(12.5%, rgba(100,100,225,0.25)), color-stop(15.625%, rgba(100,100,225,0.25)), color-stop(15.625%, rgba(0,0,0,0)), color-stop(16.667%, rgba(0,0,0,0)), color-stop(16.667%, rgba(100,100,225,0.25)), color-stop(19.792%, rgba(100,100,225,0.25)), color-stop(19.792%, rgba(0,0,0,0)), color-stop(20.833%, rgba(0,0,0,0)), color-stop(20.833%, rgba(100,100,225,0.25)), color-stop(23.958%, rgba(100,100,225,0.25)), color-stop(23.958%, rgba(0,0,0,0)), color-stop(25%, rgba(0,0,0,0)), color-stop(25%, rgba(100,100,225,0.25)), color-stop(28.125%, rgba(100,100,225,0.25)), color-stop(28.125%, rgba(0,0,0,0)), color-stop(29.167%, rgba(0,0,0,0)), color-stop(29.167%, rgba(100,100,225,0.25)), color-stop(32.292%, rgba(100,100,225,0.25)), color-stop(32.292%, rgba(0,0,0,0)), color-stop(33.333%, rgba(0,0,0,0)), color-stop(33.333%, rgba(100,100,225,0.25)), color-stop(36.458%, rgba(100,100,225,0.25)), color-stop(36.458%, rgba(0,0,0,0)), color-stop(37.5%, rgba(0,0,0,0)), color-stop(37.5%, rgba(100,100,225,0.25)), color-stop(40.625%, rgba(100,100,225,0.25)), color-stop(40.625%, rgba(0,0,0,0)), color-stop(41.667%, rgba(0,0,0,0)), color-stop(41.667%, rgba(100,100,225,0.25)), color-stop(44.792%, rgba(100,100,225,0.25)), color-stop(44.792%, rgba(0,0,0,0)), color-stop(45.833%, rgba(0,0,0,0)), color-stop(45.833%, rgba(100,100,225,0.25)), color-stop(48.958%, rgba(100,100,225,0.25)), color-stop(48.958%, rgba(0,0,0,0)), color-stop(50%, rgba(0,0,0,0)), color-stop(50%, rgba(100,100,225,0.25)), color-stop(53.125%, rgba(100,100,225,0.25)), color-stop(53.125%, rgba(0,0,0,0)), color-stop(54.167%, rgba(0,0,0,0)), color-stop(54.167%, rgba(100,100,225,0.25)), color-stop(57.292%, rgba(100,100,225,0.25)), color-stop(57.292%, rgba(0,0,0,0)), color-stop(58.333%, rgba(0,0,0,0)), color-stop(58.333%, rgba(100,100,225,0.25)), color-stop(61.458%, rgba(100,100,225,0.25)), color-stop(61.458%, rgba(0,0,0,0)), color-stop(62.5%, rgba(0,0,0,0)), color-stop(62.5%, rgba(100,100,225,0.25)), color-stop(65.625%, rgba(100,100,225,0.25)), color-stop(65.625%, rgba(0,0,0,0)), color-stop(66.667%, rgba(0,0,0,0)), color-stop(66.667%, rgba(100,100,225,0.25)), color-stop(69.792%, rgba(100,100,225,0.25)), color-stop(69.792%, rgba(0,0,0,0)), color-stop(70.833%, rgba(0,0,0,0)), color-stop(70.833%, rgba(100,100,225,0.25)), color-stop(73.958%, rgba(100,100,225,0.25)), color-stop(73.958%, rgba(0,0,0,0)), color-stop(75%, rgba(0,0,0,0)), color-stop(75%, rgba(100,100,225,0.25)), color-stop(78.125%, rgba(100,100,225,0.25)), color-stop(78.125%, rgba(0,0,0,0)), color-stop(79.167%, rgba(0,0,0,0)), color-stop(79.167%, rgba(100,100,225,0.25)), color-stop(82.292%, rgba(100,100,225,0.25)), color-stop(82.292%, rgba(0,0,0,0)), color-stop(83.333%, rgba(0,0,0,0)), color-stop(83.333%, rgba(100,100,225,0.25)), color-stop(86.458%, rgba(100,100,225,0.25)), color-stop(86.458%, rgba(0,0,0,0)), color-stop(87.5%, rgba(0,0,0,0)), color-stop(87.5%, rgba(100,100,225,0.25)), color-stop(90.625%, rgba(100,100,225,0.25)), color-stop(90.625%, rgba(0,0,0,0)), color-stop(91.667%, rgba(0,0,0,0)), color-stop(91.667%, rgba(100,100,225,0.25)), color-stop(94.792%, rgba(100,100,225,0.25)), color-stop(94.792%, rgba(0,0,0,0)), color-stop(95.833%, rgba(0,0,0,0)), color-stop(95.833%, rgba(100,100,225,0.25)), color-stop(98.958%, rgba(100,100,225,0.25)), color-stop(98.958%, rgba(0,0,0,0)), color-stop(100%, rgba(0,0,0,0)));background-image:-webkit-linear-gradient(bottom, rgba(0,0,0,0.5) 5%,rgba(0,0,0,0) 5%),-webkit-linear-gradient(left, rgba(0,0,0,0) 0px,rgba(100,100,225,0.25) 0px,rgba(100,100,225,0.25) 30px,rgba(0,0,0,0) 30px,rgba(0,0,0,0) 40px,rgba(100,100,225,0.25) 40px,rgba(100,100,225,0.25) 70px,rgba(0,0,0,0) 70px,rgba(0,0,0,0) 80px,rgba(100,100,225,0.25) 80px,rgba(100,100,225,0.25) 110px,rgba(0,0,0,0) 110px,rgba(0,0,0,0) 120px,rgba(100,100,225,0.25) 120px,rgba(100,100,225,0.25) 150px,rgba(0,0,0,0) 150px,rgba(0,0,0,0) 160px,rgba(100,100,225,0.25) 160px,rgba(100,100,225,0.25) 190px,rgba(0,0,0,0) 190px,rgba(0,0,0,0) 200px,rgba(100,100,225,0.25) 200px,rgba(100,100,225,0.25) 230px,rgba(0,0,0,0) 230px,rgba(0,0,0,0) 240px,rgba(100,100,225,0.25) 240px,rgba(100,100,225,0.25) 270px,rgba(0,0,0,0) 270px,rgba(0,0,0,0) 280px,rgba(100,100,225,0.25) 280px,rgba(100,100,225,0.25) 310px,rgba(0,0,0,0) 310px,rgba(0,0,0,0) 320px,rgba(100,100,225,0.25) 320px,rgba(100,100,225,0.25) 350px,rgba(0,0,0,0) 350px,rgba(0,0,0,0) 360px,rgba(100,100,225,0.25) 360px,rgba(100,100,225,0.25) 390px,rgba(0,0,0,0) 390px,rgba(0,0,0,0) 400px,rgba(100,100,225,0.25) 400px,rgba(100,100,225,0.25) 430px,rgba(0,0,0,0) 430px,rgba(0,0,0,0) 440px,rgba(100,100,225,0.25) 440px,rgba(100,100,225,0.25) 470px,rgba(0,0,0,0) 470px,rgba(0,0,0,0) 480px,rgba(100,100,225,0.25) 480px,rgba(100,100,225,0.25) 510px,rgba(0,0,0,0) 510px,rgba(0,0,0,0) 520px,rgba(100,100,225,0.25) 520px,rgba(100,100,225,0.25) 550px,rgba(0,0,0,0) 550px,rgba(0,0,0,0) 560px,rgba(100,100,225,0.25) 560px,rgba(100,100,225,0.25) 590px,rgba(0,0,0,0) 590px,rgba(0,0,0,0) 600px,rgba(100,100,225,0.25) 600px,rgba(100,100,225,0.25) 630px,rgba(0,0,0,0) 630px,rgba(0,0,0,0) 640px,rgba(100,100,225,0.25) 640px,rgba(100,100,225,0.25) 670px,rgba(0,0,0,0) 670px,rgba(0,0,0,0) 680px,rgba(100,100,225,0.25) 680px,rgba(100,100,225,0.25) 710px,rgba(0,0,0,0) 710px,rgba(0,0,0,0) 720px,rgba(100,100,225,0.25) 720px,rgba(100,100,225,0.25) 750px,rgba(0,0,0,0) 750px,rgba(0,0,0,0) 760px,rgba(100,100,225,0.25) 760px,rgba(100,100,225,0.25) 790px,rgba(0,0,0,0) 790px,rgba(0,0,0,0) 800px,rgba(100,100,225,0.25) 800px,rgba(100,100,225,0.25) 830px,rgba(0,0,0,0) 830px,rgba(0,0,0,0) 840px,rgba(100,100,225,0.25) 840px,rgba(100,100,225,0.25) 870px,rgba(0,0,0,0) 870px,rgba(0,0,0,0) 880px,rgba(100,100,225,0.25) 880px,rgba(100,100,225,0.25) 910px,rgba(0,0,0,0) 910px,rgba(0,0,0,0) 920px,rgba(100,100,225,0.25) 920px,rgba(100,100,225,0.25) 950px,rgba(0,0,0,0) 950px,rgba(0,0,0,0) 960px);background-image:-moz-linear-gradient(bottom, rgba(0,0,0,0.5) 5%,rgba(0,0,0,0) 5%),-moz-linear-gradient(left, rgba(0,0,0,0) 0px,rgba(100,100,225,0.25) 0px,rgba(100,100,225,0.25) 30px,rgba(0,0,0,0) 30px,rgba(0,0,0,0) 40px,rgba(100,100,225,0.25) 40px,rgba(100,100,225,0.25) 70px,rgba(0,0,0,0) 70px,rgba(0,0,0,0) 80px,rgba(100,100,225,0.25) 80px,rgba(100,100,225,0.25) 110px,rgba(0,0,0,0) 110px,rgba(0,0,0,0) 120px,rgba(100,100,225,0.25) 120px,rgba(100,100,225,0.25) 150px,rgba(0,0,0,0) 150px,rgba(0,0,0,0) 160px,rgba(100,100,225,0.25) 160px,rgba(100,100,225,0.25) 190px,rgba(0,0,0,0) 190px,rgba(0,0,0,0) 200px,rgba(100,100,225,0.25) 200px,rgba(100,100,225,0.25) 230px,rgba(0,0,0,0) 230px,rgba(0,0,0,0) 240px,rgba(100,100,225,0.25) 240px,rgba(100,100,225,0.25) 270px,rgba(0,0,0,0) 270px,rgba(0,0,0,0) 280px,rgba(100,100,225,0.25) 280px,rgba(100,100,225,0.25) 310px,rgba(0,0,0,0) 310px,rgba(0,0,0,0) 320px,rgba(100,100,225,0.25) 320px,rgba(100,100,225,0.25) 350px,rgba(0,0,0,0) 350px,rgba(0,0,0,0) 360px,rgba(100,100,225,0.25) 360px,rgba(100,100,225,0.25) 390px,rgba(0,0,0,0) 390px,rgba(0,0,0,0) 400px,rgba(100,100,225,0.25) 400px,rgba(100,100,225,0.25) 430px,rgba(0,0,0,0) 430px,rgba(0,0,0,0) 440px,rgba(100,100,225,0.25) 440px,rgba(100,100,225,0.25) 470px,rgba(0,0,0,0) 470px,rgba(0,0,0,0) 480px,rgba(100,100,225,0.25) 480px,rgba(100,100,225,0.25) 510px,rgba(0,0,0,0) 510px,rgba(0,0,0,0) 520px,rgba(100,100,225,0.25) 520px,rgba(100,100,225,0.25) 550px,rgba(0,0,0,0) 550px,rgba(0,0,0,0) 560px,rgba(100,100,225,0.25) 560px,rgba(100,100,225,0.25) 590px,rgba(0,0,0,0) 590px,rgba(0,0,0,0) 600px,rgba(100,100,225,0.25) 600px,rgba(100,100,225,0.25) 630px,rgba(0,0,0,0) 630px,rgba(0,0,0,0) 640px,rgba(100,100,225,0.25) 640px,rgba(100,100,225,0.25) 670px,rgba(0,0,0,0) 670px,rgba(0,0,0,0) 680px,rgba(100,100,225,0.25) 680px,rgba(100,100,225,0.25) 710px,rgba(0,0,0,0) 710px,rgba(0,0,0,0) 720px,rgba(100,100,225,0.25) 720px,rgba(100,100,225,0.25) 750px,rgba(0,0,0,0) 750px,rgba(0,0,0,0) 760px,rgba(100,100,225,0.25) 760px,rgba(100,100,225,0.25) 790px,rgba(0,0,0,0) 790px,rgba(0,0,0,0) 800px,rgba(100,100,225,0.25) 800px,rgba(100,100,225,0.25) 830px,rgba(0,0,0,0) 830px,rgba(0,0,0,0) 840px,rgba(100,100,225,0.25) 840px,rgba(100,100,225,0.25) 870px,rgba(0,0,0,0) 870px,rgba(0,0,0,0) 880px,rgba(100,100,225,0.25) 880px,rgba(100,100,225,0.25) 910px,rgba(0,0,0,0) 910px,rgba(0,0,0,0) 920px,rgba(100,100,225,0.25) 920px,rgba(100,100,225,0.25) 950px,rgba(0,0,0,0) 950px,rgba(0,0,0,0) 960px);background-image:-o-linear-gradient(bottom, rgba(0,0,0,0.5) 5%,rgba(0,0,0,0) 5%),-o-linear-gradient(left, rgba(0,0,0,0) 0px,rgba(100,100,225,0.25) 0px,rgba(100,100,225,0.25) 30px,rgba(0,0,0,0) 30px,rgba(0,0,0,0) 40px,rgba(100,100,225,0.25) 40px,rgba(100,100,225,0.25) 70px,rgba(0,0,0,0) 70px,rgba(0,0,0,0) 80px,rgba(100,100,225,0.25) 80px,rgba(100,100,225,0.25) 110px,rgba(0,0,0,0) 110px,rgba(0,0,0,0) 120px,rgba(100,100,225,0.25) 120px,rgba(100,100,225,0.25) 150px,rgba(0,0,0,0) 150px,rgba(0,0,0,0) 160px,rgba(100,100,225,0.25) 160px,rgba(100,100,225,0.25) 190px,rgba(0,0,0,0) 190px,rgba(0,0,0,0) 200px,rgba(100,100,225,0.25) 200px,rgba(100,100,225,0.25) 230px,rgba(0,0,0,0) 230px,rgba(0,0,0,0) 240px,rgba(100,100,225,0.25) 240px,rgba(100,100,225,0.25) 270px,rgba(0,0,0,0) 270px,rgba(0,0,0,0) 280px,rgba(100,100,225,0.25) 280px,rgba(100,100,225,0.25) 310px,rgba(0,0,0,0) 310px,rgba(0,0,0,0) 320px,rgba(100,100,225,0.25) 320px,rgba(100,100,225,0.25) 350px,rgba(0,0,0,0) 350px,rgba(0,0,0,0) 360px,rgba(100,100,225,0.25) 360px,rgba(100,100,225,0.25) 390px,rgba(0,0,0,0) 390px,rgba(0,0,0,0) 400px,rgba(100,100,225,0.25) 400px,rgba(100,100,225,0.25) 430px,rgba(0,0,0,0) 430px,rgba(0,0,0,0) 440px,rgba(100,100,225,0.25) 440px,rgba(100,100,225,0.25) 470px,rgba(0,0,0,0) 470px,rgba(0,0,0,0) 480px,rgba(100,100,225,0.25) 480px,rgba(100,100,225,0.25) 510px,rgba(0,0,0,0) 510px,rgba(0,0,0,0) 520px,rgba(100,100,225,0.25) 520px,rgba(100,100,225,0.25) 550px,rgba(0,0,0,0) 550px,rgba(0,0,0,0) 560px,rgba(100,100,225,0.25) 560px,rgba(100,100,225,0.25) 590px,rgba(0,0,0,0) 590px,rgba(0,0,0,0) 600px,rgba(100,100,225,0.25) 600px,rgba(100,100,225,0.25) 630px,rgba(0,0,0,0) 630px,rgba(0,0,0,0) 640px,rgba(100,100,225,0.25) 640px,rgba(100,100,225,0.25) 670px,rgba(0,0,0,0) 670px,rgba(0,0,0,0) 680px,rgba(100,100,225,0.25) 680px,rgba(100,100,225,0.25) 710px,rgba(0,0,0,0) 710px,rgba(0,0,0,0) 720px,rgba(100,100,225,0.25) 720px,rgba(100,100,225,0.25) 750px,rgba(0,0,0,0) 750px,rgba(0,0,0,0) 760px,rgba(100,100,225,0.25) 760px,rgba(100,100,225,0.25) 790px,rgba(0,0,0,0) 790px,rgba(0,0,0,0) 800px,rgba(100,100,225,0.25) 800px,rgba(100,100,225,0.25) 830px,rgba(0,0,0,0) 830px,rgba(0,0,0,0) 840px,rgba(100,100,225,0.25) 840px,rgba(100,100,225,0.25) 870px,rgba(0,0,0,0) 870px,rgba(0,0,0,0) 880px,rgba(100,100,225,0.25) 880px,rgba(100,100,225,0.25) 910px,rgba(0,0,0,0) 910px,rgba(0,0,0,0) 920px,rgba(100,100,225,0.25) 920px,rgba(100,100,225,0.25) 950px,rgba(0,0,0,0) 950px,rgba(0,0,0,0) 960px);background-image:-ms-linear-gradient(bottom, rgba(0,0,0,0.5) 5%,rgba(0,0,0,0) 5%),-ms-linear-gradient(left, rgba(0,0,0,0) 0px,rgba(100,100,225,0.25) 0px,rgba(100,100,225,0.25) 30px,rgba(0,0,0,0) 30px,rgba(0,0,0,0) 40px,rgba(100,100,225,0.25) 40px,rgba(100,100,225,0.25) 70px,rgba(0,0,0,0) 70px,rgba(0,0,0,0) 80px,rgba(100,100,225,0.25) 80px,rgba(100,100,225,0.25) 110px,rgba(0,0,0,0) 110px,rgba(0,0,0,0) 120px,rgba(100,100,225,0.25) 120px,rgba(100,100,225,0.25) 150px,rgba(0,0,0,0) 150px,rgba(0,0,0,0) 160px,rgba(100,100,225,0.25) 160px,rgba(100,100,225,0.25) 190px,rgba(0,0,0,0) 190px,rgba(0,0,0,0) 200px,rgba(100,100,225,0.25) 200px,rgba(100,100,225,0.25) 230px,rgba(0,0,0,0) 230px,rgba(0,0,0,0) 240px,rgba(100,100,225,0.25) 240px,rgba(100,100,225,0.25) 270px,rgba(0,0,0,0) 270px,rgba(0,0,0,0) 280px,rgba(100,100,225,0.25) 280px,rgba(100,100,225,0.25) 310px,rgba(0,0,0,0) 310px,rgba(0,0,0,0) 320px,rgba(100,100,225,0.25) 320px,rgba(100,100,225,0.25) 350px,rgba(0,0,0,0) 350px,rgba(0,0,0,0) 360px,rgba(100,100,225,0.25) 360px,rgba(100,100,225,0.25) 390px,rgba(0,0,0,0) 390px,rgba(0,0,0,0) 400px,rgba(100,100,225,0.25) 400px,rgba(100,100,225,0.25) 430px,rgba(0,0,0,0) 430px,rgba(0,0,0,0) 440px,rgba(100,100,225,0.25) 440px,rgba(100,100,225,0.25) 470px,rgba(0,0,0,0) 470px,rgba(0,0,0,0) 480px,rgba(100,100,225,0.25) 480px,rgba(100,100,225,0.25) 510px,rgba(0,0,0,0) 510px,rgba(0,0,0,0) 520px,rgba(100,100,225,0.25) 520px,rgba(100,100,225,0.25) 550px,rgba(0,0,0,0) 550px,rgba(0,0,0,0) 560px,rgba(100,100,225,0.25) 560px,rgba(100,100,225,0.25) 590px,rgba(0,0,0,0) 590px,rgba(0,0,0,0) 600px,rgba(100,100,225,0.25) 600px,rgba(100,100,225,0.25) 630px,rgba(0,0,0,0) 630px,rgba(0,0,0,0) 640px,rgba(100,100,225,0.25) 640px,rgba(100,100,225,0.25) 670px,rgba(0,0,0,0) 670px,rgba(0,0,0,0) 680px,rgba(100,100,225,0.25) 680px,rgba(100,100,225,0.25) 710px,rgba(0,0,0,0) 710px,rgba(0,0,0,0) 720px,rgba(100,100,225,0.25) 720px,rgba(100,100,225,0.25) 750px,rgba(0,0,0,0) 750px,rgba(0,0,0,0) 760px,rgba(100,100,225,0.25) 760px,rgba(100,100,225,0.25) 790px,rgba(0,0,0,0) 790px,rgba(0,0,0,0) 800px,rgba(100,100,225,0.25) 800px,rgba(100,100,225,0.25) 830px,rgba(0,0,0,0) 830px,rgba(0,0,0,0) 840px,rgba(100,100,225,0.25) 840px,rgba(100,100,225,0.25) 870px,rgba(0,0,0,0) 870px,rgba(0,0,0,0) 880px,rgba(100,100,225,0.25) 880px,rgba(100,100,225,0.25) 910px,rgba(0,0,0,0) 910px,rgba(0,0,0,0) 920px,rgba(100,100,225,0.25) 920px,rgba(100,100,225,0.25) 950px,rgba(0,0,0,0) 950px,rgba(0,0,0,0) 960px);background-image:linear-gradient(bottom, rgba(0,0,0,0.5) 5%,rgba(0,0,0,0) 5%),linear-gradient(left, rgba(0,0,0,0) 0px,rgba(100,100,225,0.25) 0px,rgba(100,100,225,0.25) 30px,rgba(0,0,0,0) 30px,rgba(0,0,0,0) 40px,rgba(100,100,225,0.25) 40px,rgba(100,100,225,0.25) 70px,rgba(0,0,0,0) 70px,rgba(0,0,0,0) 80px,rgba(100,100,225,0.25) 80px,rgba(100,100,225,0.25) 110px,rgba(0,0,0,0) 110px,rgba(0,0,0,0) 120px,rgba(100,100,225,0.25) 120px,rgba(100,100,225,0.25) 150px,rgba(0,0,0,0) 150px,rgba(0,0,0,0) 160px,rgba(100,100,225,0.25) 160px,rgba(100,100,225,0.25) 190px,rgba(0,0,0,0) 190px,rgba(0,0,0,0) 200px,rgba(100,100,225,0.25) 200px,rgba(100,100,225,0.25) 230px,rgba(0,0,0,0) 230px,rgba(0,0,0,0) 240px,rgba(100,100,225,0.25) 240px,rgba(100,100,225,0.25) 270px,rgba(0,0,0,0) 270px,rgba(0,0,0,0) 280px,rgba(100,100,225,0.25) 280px,rgba(100,100,225,0.25) 310px,rgba(0,0,0,0) 310px,rgba(0,0,0,0) 320px,rgba(100,100,225,0.25) 320px,rgba(100,100,225,0.25) 350px,rgba(0,0,0,0) 350px,rgba(0,0,0,0) 360px,rgba(100,100,225,0.25) 360px,rgba(100,100,225,0.25) 390px,rgba(0,0,0,0) 390px,rgba(0,0,0,0) 400px,rgba(100,100,225,0.25) 400px,rgba(100,100,225,0.25) 430px,rgba(0,0,0,0) 430px,rgba(0,0,0,0) 440px,rgba(100,100,225,0.25) 440px,rgba(100,100,225,0.25) 470px,rgba(0,0,0,0) 470px,rgba(0,0,0,0) 480px,rgba(100,100,225,0.25) 480px,rgba(100,100,225,0.25) 510px,rgba(0,0,0,0) 510px,rgba(0,0,0,0) 520px,rgba(100,100,225,0.25) 520px,rgba(100,100,225,0.25) 550px,rgba(0,0,0,0) 550px,rgba(0,0,0,0) 560px,rgba(100,100,225,0.25) 560px,rgba(100,100,225,0.25) 590px,rgba(0,0,0,0) 590px,rgba(0,0,0,0) 600px,rgba(100,100,225,0.25) 600px,rgba(100,100,225,0.25) 630px,rgba(0,0,0,0) 630px,rgba(0,0,0,0) 640px,rgba(100,100,225,0.25) 640px,rgba(100,100,225,0.25) 670px,rgba(0,0,0,0) 670px,rgba(0,0,0,0) 680px,rgba(100,100,225,0.25) 680px,rgba(100,100,225,0.25) 710px,rgba(0,0,0,0) 710px,rgba(0,0,0,0) 720px,rgba(100,100,225,0.25) 720px,rgba(100,100,225,0.25) 750px,rgba(0,0,0,0) 750px,rgba(0,0,0,0) 760px,rgba(100,100,225,0.25) 760px,rgba(100,100,225,0.25) 790px,rgba(0,0,0,0) 790px,rgba(0,0,0,0) 800px,rgba(100,100,225,0.25) 800px,rgba(100,100,225,0.25) 830px,rgba(0,0,0,0) 830px,rgba(0,0,0,0) 840px,rgba(100,100,225,0.25) 840px,rgba(100,100,225,0.25) 870px,rgba(0,0,0,0) 870px,rgba(0,0,0,0) 880px,rgba(100,100,225,0.25) 880px,rgba(100,100,225,0.25) 910px,rgba(0,0,0,0) 910px,rgba(0,0,0,0) 920px,rgba(100,100,225,0.25) 920px,rgba(100,100,225,0.25) 950px,rgba(0,0,0,0) 950px,rgba(0,0,0,0) 960px);-moz-background-size:100% 24px,auto;-webkit-background-size:100% 24px,auto;-o-background-size:100% 24px,auto;background-size:100% 24px,auto;background-position:left top}body.bp .feedback,body.bp .error,body.bp .alert,body.bp .notice,body.bp .success,body.bp .info{padding:0.8em;margin-bottom:1em;border:2px solid #ddd}body.bp .error,body.bp .alert{background:#fbe3e4;color:#8a1f11;border-color:#fbc2c4}body.bp .error a,body.bp .alert a{color:#8a1f11}body.bp .notice{background:#fff6bf;color:#514721;border-color:#ffd324}body.bp .notice a{color:#514721}body.bp .success{background:#e6efc2;color:#264409;border-color:#c6d880}body.bp .success a{color:#264409}body.bp .info{background:#d5edf8;color:#205791;border-color:#92cae4}body.bp .info a{color:#205791}body.bp .hide{display:none}body.bp .highlight{background:#ff0}body.bp .added{background:#060;color:#fff}body.bp .removed{background:#900;color:#fff}body.bp .box{padding:1.5em;margin-bottom:1.5em;background:#e5ecf9}body.bp .border{border-right:1px solid #eeeeee}body.bp .colborder{padding-right:2.084%;margin-right:2.084%;border-right:1px solid #eeeeee}body.bp hr{background:#dddddd;color:#dddddd;clear:both;width:100%;height:0.083em;margin:0;margin-left:2.084%;margin-right:2.084%;border:none}body.bp hr.space{background:#dddddd;color:#dddddd;clear:both;width:100%;height:0.083em;margin:0;margin-left:2.084%;margin-right:2.084%;border:none;background:white;color:white}body.bp form.inline{line-height:3}body.bp form.inline p{margin-bottom:0}form.bp label{font-weight:bold}form.bp fieldset{padding:1.4em;margin:0 0 1.5em 0}form.bp legend{font-weight:bold;font-size:1.2em}form.bp input.text,form.bp input.title,form.bp input[type=email],form.bp input[type=text],form.bp input[type=password]{margin:0.5em 0;background-color:white;padding:5px}form.bp input.title{font-size:1.5em}form.bp textarea{margin:0.5em 0;padding:5px}form.bp select{margin:0.5em 0}form.bp fieldset{border:1px solid #ccc}form.bp input.text,form.bp input.title,form.bp input[type=email],form.bp input[type=text],form.bp input[type=password],form.bp textarea{background-color:#fff;border:1px solid #bbb}form.bp input.text:focus,form.bp input.title:focus,form.bp input[type=email]:focus,form.bp input[type=text]:focus,form.bp input[type=password]:focus,form.bp textarea:focus{border-color:#666}form.bp select{background-color:#fff;border-width:1px;border-style:solid}form.bp input.text,form.bp input.title,form.bp input[type=email],form.bp input[type=text],form.bp input[type=password]{width:300px}form.bp textarea{width:390px;height:250px}body.two-col #container{min-width:950px;width:80%;margin:0 auto;overflow:hidden;*zoom:1}body.two-col #header,body.two-col #footer{display:inline;float:left;overflow:hidden;width:99.974%;margin-right:1.042%}body.two-col #sidebar{display:inline;float:left;overflow:hidden;width:32.63%;margin-right:1.042%}body.two-col #content{display:inline;float:left;overflow:hidden;width:66.302%;margin-right:0}body.three-col #container{min-width:950px;width:80%;margin:0 auto;overflow:hidden;*zoom:1}body.three-col #header,body.three-col #footer{display:inline;float:left;overflow:hidden;width:99.974%;margin-right:1.042%}body.three-col section.column{display:inline;float:left;overflow:hidden;width:32.63%;margin-right:1.042%}body.three-col section.column.last{display:inline;float:left;overflow:hidden;width:28.421%;margin-right:0}body{background-color:#dadadc}body #header{padding-bottom:40px}body #container{padding:10px;background-color:#fff;-moz-box-shadow:#727278 2px 2px 6px;-webkit-box-shadow:#727278 2px 2px 6px;-o-box-shadow:#727278 2px 2px 6px;box-shadow:#727278 2px 2px 6px;-moz-border-radius:10px;-webkit-border-radius:10px;-o-border-radius:10px;-ms-border-radius:10px;-khtml-border-radius:10px;border-radius:10px}body #container nav ul{margin:0;padding:0;border:0;overflow:hidden;*zoom:1}body #container nav ul li{list-style-image:none;list-style-type:none;margin-left:0px;display:-moz-inline-box;-moz-box-orient:vertical;display:inline-block;vertical-align:middle;*vertical-align:auto;white-space:nowrap}body #container nav ul li{*display:inline}body #container section{background-color:#fff;border:solid 1px #ccc;-moz-border-radius:6px;-webkit-border-radius:6px;-o-border-radius:6px;-ms-border-radius:6px;-khtml-border-radius:6px;border-radius:6px;min-height:170px}body #container section:hover{background-color:#f7f7f7}form{width:450px} diff --git a/templates/base.html b/templates/base.html index f714b30..60528d8 100644 --- a/templates/base.html +++ b/templates/base.html @@ -1,12 +1,21 @@ + {%block title%}Userinfo{%endblock%} + + + + {%block headinc %} {%endblock%} - - {%block content%} - {%endblock%} + +
+ {%block content%} + {%endblock%} +
{%block tailinc %} {%endblock%} diff --git a/templates/private/profile.html b/templates/private/profile.html index 5e63765..2080ead 100644 --- a/templates/private/profile.html +++ b/templates/private/profile.html @@ -1,38 +1,49 @@ {% extends "base.html" %} {% block headinc %} - {% endblock %} {% block content %} -

Meny

- -

Om deg

- -

Dine grupper

- -

Dine tjenester

- +
+ +
+

Om deg

+
    +
  • Brukernavn: {{ldap_user.username}}
    • +
  • Navn: {{ldap_user.full_name}}
    • +
  • Mail: {{ldap_user.email}}
    • +
+
+
+

Dine grupper

+
    + {% if groups %} +
  • {{ private_group }}
    • + {% for group in groups %} +
  • {{ group }}
    • + {% endfor %} + {% else %} +
  • Ingen grupper.
    • + {% endif %} +
+
+
+

Dine tjenester

+
    +
  • Klientmaskiner
    • +
  • Trådløst nettverk
    • +
+
+
{%endblock%} diff --git a/templates/registration/password_change_form.html b/templates/registration/password_change_form.html index 8fe78d4..cc44dfd 100644 --- a/templates/registration/password_change_form.html +++ b/templates/registration/password_change_form.html @@ -4,9 +4,11 @@

Allows a user to change their password.

-
+ {% csrf_token %} - {{form}} + + {{ form.as_table }} +
{% endblock %} diff --git a/templates/registration/password_reset_form.html b/templates/registration/password_reset_form.html index 65f2837..8b04c73 100644 --- a/templates/registration/password_reset_form.html +++ b/templates/registration/password_reset_form.html @@ -3,9 +3,9 @@ {% block content %}

Allows a user to reset their password by generating a one-time use link that can be used to reset the password, and sending that link to the user's registered email address. -

+ {% csrf_token %} - {{ form }} + {{ form.as_table }}