Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
7
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Open sidebar
AE
Sith
Commits
f600e174
Commit
f600e174
authored
Jul 16, 2016
by
Skia
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
CSS and templating, Sith begins to look nice
parent
171303cf
Pipeline
#53
failed with stage
in 1 minute
Changes
11
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
11 changed files
with
429 additions
and
42 deletions
+429
-42
core/management/commands/populate.py
core/management/commands/populate.py
+1
-1
core/static/core/base.css
core/static/core/base.css
+45
-0
core/static/core/form.css
core/static/core/form.css
+188
-0
core/static/core/img/logo.png
core/static/core/img/logo.png
+0
-0
core/static/core/style.css
core/static/core/style.css
+156
-4
core/templates/core/base.jinja
core/templates/core/base.jinja
+17
-19
core/templates/core/page_detail.jinja
core/templates/core/page_detail.jinja
+3
-2
core/templates/core/user_detail.jinja
core/templates/core/user_detail.jinja
+14
-12
core/templates/core/user_edit.jinja
core/templates/core/user_edit.jinja
+3
-1
core/templates/core/user_tools.jinja
core/templates/core/user_tools.jinja
+0
-1
counter/templates/counter/counter_main.jinja
counter/templates/counter/counter_main.jinja
+2
-2
No files found.
core/management/commands/populate.py
View file @
f600e174
...
@@ -117,7 +117,7 @@ Cette page vise à documenter la syntaxe *Markdown* utilisée sur le site.
...
@@ -117,7 +117,7 @@ Cette page vise à documenter la syntaxe *Markdown* utilisée sur le site.
p
.
set_lock
(
skia
)
p
.
set_lock
(
skia
)
p
.
save
()
p
.
save
()
with
open
(
os
.
path
.
join
(
root_path
)
+
'/README.md'
,
'r'
)
as
rm
:
with
open
(
os
.
path
.
join
(
root_path
)
+
'/README.md'
,
'r'
)
as
rm
:
PageRev
(
page
=
p
,
title
=
"REA
M
DE"
,
author
=
skia
,
content
=
rm
.
read
()).
save
()
PageRev
(
page
=
p
,
title
=
"READ
M
E"
,
author
=
skia
,
content
=
rm
.
read
()).
save
()
# Subscription
# Subscription
## Skia
## Skia
...
...
core/static/core/base.css
0 → 100644
View file @
f600e174
/*--------------------------------RESET--------------------------------*/
/*--------------------------------RESET--------------------------------*/
html
,
body
,
div
,
span
,
applet
,
object
,
iframe
,
h1
,
h2
,
h3
,
h4
,
h5
,
h6
,
p
,
blockquote
,
pre
,
a
,
abbr
,
acronym
,
address
,
big
,
cite
,
code
,
del
,
dfn
,
em
,
img
,
ins
,
kbd
,
q
,
s
,
samp
,
small
,
strike
,
strong
,
sub
,
sup
,
tt
,
var
,
b
,
u
,
i
,
center
,
dl
,
dt
,
dd
,
ol
,
ul
,
li
,
fieldset
,
form
,
label
,
legend
,
table
,
caption
,
tbody
,
tfoot
,
thead
,
tr
,
th
,
td
,
article
,
aside
,
canvas
,
details
,
embed
,
figure
,
figcaption
,
footer
,
header
,
hgroup
,
menu
,
nav
,
output
,
ruby
,
section
,
summary
,
time
,
mark
,
audio
,
video
{
margin
:
0
;
padding
:
0
;
border
:
0
;
font-size
:
100%
;
font
:
inherit
;
vertical-align
:
baseline
;
}
/* HTML5 display-role reset for older browsers */
article
,
aside
,
details
,
figcaption
,
figure
,
footer
,
header
,
hgroup
,
menu
,
nav
,
section
{
display
:
block
;
}
body
{
line-height
:
1
;
}
ol
,
ul
{
list-style
:
none
;
}
blockquote
,
q
{
quotes
:
none
;
}
blockquote
:before
,
blockquote
:after
,
q
:before
,
q
:after
{
content
:
''
;
content
:
none
;
}
table
{
border-collapse
:
collapse
;
border-spacing
:
0
;
}
core/static/core/form.css
0 → 100644
View file @
f600e174
/* ----------------------------------------------------------------------------------------------------
Super Form Reset
----------------------------------------------------------------------------------------------------*/
input
,
label
,
select
,
button
,
textarea
{
margin
:
0
;
border
:
0
;
padding
:
0
;
display
:
inline-block
;
vertical-align
:
middle
;
white-space
:
normal
;
background
:
none
;
line-height
:
1
;
/* Browsers have different default form fonts */
font-size
:
13px
;
font-family
:
Arial
;
}
/* Remove the stupid outer glow in Webkit */
input
:focus
{
outline
:
0
;
}
/* Box Sizing Reset
-----------------------------------------------*/
/* All of our custom controls should be what we expect them to be */
input
,
textarea
{
-webkit-box-sizing
:
content-box
;
-moz-box-sizing
:
content-box
;
box-sizing
:
content-box
;
}
/* These elements are usually rendered a certain way by the browser */
button
,
input
[
type
=
reset
],
input
[
type
=
button
],
input
[
type
=
submit
],
input
[
type
=
checkbox
],
input
[
type
=
radio
],
select
{
-webkit-box-sizing
:
border-box
;
-moz-box-sizing
:
border-box
;
box-sizing
:
border-box
;
}
/* Text Inputs
-----------------------------------------------*/
input
[
type
=
date
],
input
[
type
=
datetime
],
input
[
type
=
datetime-local
],
input
[
type
=
email
],
input
[
type
=
month
],
input
[
type
=
number
],
input
[
type
=
password
],
input
[
type
=
range
],
input
[
type
=
search
],
input
[
type
=
tel
],
input
[
type
=
text
],
input
[
type
=
time
],
input
[
type
=
url
],
input
[
type
=
week
]
{
background-color
:
white
;
border
:
1px
solid
black
;
padding
:
2px
;
border-radius
:
2px
;
}
/* Button Controls
-----------------------------------------------*/
input
[
type
=
checkbox
],
input
[
type
=
radio
]
{
width
:
13px
;
height
:
13px
;
}
/* File Uploads
-----------------------------------------------*/
input
[
type
=
file
]
{
}
/* Search Input
-----------------------------------------------*/
/* Make webkit render the search input like a normal text field */
input
[
type
=
search
]
{
-webkit-appearance
:
textfield
;
-webkit-box-sizing
:
content-box
;
}
/* Turn off the recent search for webkit. It adds about 15px padding on the left */
::-webkit-search-decoration
{
display
:
none
;
}
/* Buttons
-----------------------------------------------*/
button
,
input
[
type
=
"reset"
],
input
[
type
=
"button"
],
input
[
type
=
"submit"
]
{
/* Fix IE7 display bug */
overflow
:
visible
;
width
:
auto
;
cursor
:
pointer
;
padding
:
3px
;
border
:
1px
solid
black
;
border-radius
:
2px
;
background-color
:
white
;
}
button
:hover
,
input
[
type
=
"reset"
]
:hover
,
input
[
type
=
"button"
]
:hover
,
input
[
type
=
"submit"
]
:hover
{
box-shadow
:
0
0
2px
#000
;
}
button
:active
,
input
[
type
=
"reset"
]
:active
,
input
[
type
=
"button"
]
:active
,
input
[
type
=
"submit"
]
:active
{
box-shadow
:
inset
0
0
2px
#000
;
}
/* IE8 and FF freak out if this rule is within another selector */
::-webkit-file-upload-button
{
padding
:
0
;
border
:
0
;
background
:
none
;
}
/* Textarea
-----------------------------------------------*/
textarea
{
/* Move the label to the top */
vertical-align
:
top
;
/* Turn off scroll bars in IE unless needed */
overflow
:
auto
;
}
/* Selects
-----------------------------------------------*/
select
{
}
select
[
multiple
]
{
/* Move the label to the top */
vertical-align
:
top
;
}
/* Tables
-----------------------------------------------*/
tbody
>
tr
{
display
:
block
;
margin
:
3px
;
}
core/static/core/img/logo.png
0 → 100644
View file @
f600e174
9.84 KB
core/static/core/style.css
View file @
f600e174
body
{
/*--------------------------------GENERAL------------------------------*/
background
:
#EEE
;
body
{
background-color
:
#EEE
;
position
:
relative
;
width
:
100%
;
font-family
:
sans-serif
;
}
/*--------------------------------HEADER-------------------------------*/
#logo
{
margin-left
:
5%
;
}
header
{
display
:
block
;
position
:
absolute
;
top
:
0px
;
right
:
8%
;
left
:
40%
;
background-color
:
#DDD
;
height
:
3em
;
}
header
a
{
display
:
inline-block
;
color
:
inherit
;
text-decoration
:
none
;
padding
:
1em
;
}
header
a
:hover
{
color
:
#2D3
;
}
/*---------------------------------NAV---------------------------------*/
nav
{
display
:
block
;
width
:
90%
;
margin
:
0px
auto
;
background
:
grey
;
color
:
white
;
}
nav
a
{
color
:
white
;
font-style
:
normal
;
font-weight
:
bolder
;
text-decoration
:
none
;
display
:
inline-block
;
padding
:
20px
;
}
nav
a
:hover
{
background
:
purple
;
}
/*--------------------------------CONTENT------------------------------*/
#content
{
width
:
88%
;
margin
:
0px
auto
;
padding
:
1em
1%
;
background
:
white
;
}
h1
,
h2
,
h3
,
h4
,
h5
,
h6
{
font-weight
:
bold
;
margin-top
:
0.5em
;
}
h1
{
font-size
:
160%
;
margin-left
:
50px
;
}
h2
{
font-size
:
150%
;
margin-left
:
40px
;
}
h3
{
font-size
:
140%
;
margin-left
:
30px
;
}
h4
{
font-size
:
130%
;
margin-left
:
20px
;
}
h5
{
font-size
:
120%
;
margin-left
:
10px
;
}
h6
{
font-size
:
110%
;
margin-left
:
0px
;
}
p
,
pre
{
margin-top
:
1em
;
margin-left
:
0px
;
}
ul
,
ol
{
margin-top
:
1em
;
list-style-type
:
disc
;
margin-left
:
25px
;
}
.edit-bar
{
display
:
block
;
margin
:
4px
;
}
.edit-bar
a
{
display
:
inline-block
;
margin
:
4px
;
}
}
div
{
/*-----------------------------USER PROFILE----------------------------*/
box-shadow
:
2px
2px
10px
#888888
;
.user_profile
{
}
/*---------------------------------PAGE--------------------------------*/
.page_content
{
display
:
block
;
margin
:
10px
;
margin
:
10px
;
padding
:
10px
;
padding
:
10px
;
background
:
white
;
}
.page_content
code
{
font-family
:
monospace
;
color
:
white
;
background
:
black
;
display
:
inline-block
;
padding
:
4px
;
line-height
:
120%
;
}
/*--------------------------------FOOTER-------------------------------*/
footer
{
text-align
:
center
;
}
/*--------------------------------MODALE-------------------------------*/
.form-wrapper
{
display
:
inline-block
;
position
:
absolute
;
top
:
0
;
left
:
0
;
width
:
100%
;
height
:
100%
;
background-color
:
#DDD
;
opacity
:
0.8
;
padding
:
15px
;
border-radius
:
4px
;
}
.form-wrapper
>
form
{
display
:
inline-block
;
position
:
absolute
;
padding
:
15px
;
border-radius
:
4px
;
left
:
30%
;
top
:
40%
;
background-color
:
white
;
}
}
core/templates/core/base.jinja
View file @
f600e174
...
@@ -3,6 +3,8 @@
...
@@ -3,6 +3,8 @@
<head>
<head>
{%
block
head
%}
{%
block
head
%}
<title>
{%
block
title
%}
Bienvenue sur le Sith de l'AE!
{%
endblock
%}
</title>
<title>
{%
block
title
%}
Bienvenue sur le Sith de l'AE!
{%
endblock
%}
</title>
<link
rel=
"stylesheet"
href=
"
{{
static
(
'core/base.css'
)
}}
"
>
<link
rel=
"stylesheet"
href=
"
{{
static
(
'core/form.css'
)
}}
"
>
<link
rel=
"stylesheet"
href=
"
{{
static
(
'core/style.css'
)
}}
"
>
<link
rel=
"stylesheet"
href=
"
{{
static
(
'core/style.css'
)
}}
"
>
<script
src=
"
{{
static
(
'core/script.js'
)
}}
"
></script>
<script
src=
"
{{
static
(
'core/script.js'
)
}}
"
></script>
<script
src=
"http://code.jquery.com/jquery-2.2.0.min.js"
></script>
<script
src=
"http://code.jquery.com/jquery-2.2.0.min.js"
></script>
...
@@ -10,28 +12,24 @@
...
@@ -10,28 +12,24 @@
</head>
</head>
<body>
<body>
<div
id=
"logo"
><a
href=
"
{{
url
(
'core:index'
)
}}
"
><img
src=
"
{{
static
(
'core/img/logo.png'
)
}}
"
alt=
"Logo"
/></a></div>
{%
block
header
%}
<header>
<header>
{%
block
header
%}
{%
if
not
user.is_authenticated
()
%}
{%
if
user.is_authenticated
()
%}
Hello,
{{
user.username
}}
!
{%
endif
%}
<a
href=
"
{{
url
(
'core:register'
)
}}
"
>
Register
</a>
|
<ul>
<a
href=
"
{{
url
(
'core:login'
)
}}
"
>
Login
</a>
{%
if
not
user.is_authenticated
()
%}
{%
else
%}
<li><a
href=
"
{{
url
(
'core:register'
)
}}
"
>
Register
</a></li>
<a
href=
"
{{
url
(
'core:user_profile'
,
user_id
=
user.id
)
}}
"
>
{{
user.get_display_name
()
}}
</a>
|
<li><a
href=
"
{{
url
(
'core:login'
)
}}
"
>
Login
</a></li>
<a
href=
"
{{
url
(
'core:user_tools'
)
}}
"
>
Tools
</a>
|
{%
else
%}
<a
href=
"
{{
url
(
'core:logout'
)
}}
"
>
Logout
</a>
<li><a
href=
"
{{
url
(
'core:logout'
)
}}
"
>
Logout
</a></li>
{%
endif
%}
</ul>
{%
if
user.is_authenticated
()
%}
<ul>
<li><a
href=
"
{{
url
(
'core:user_profile'
,
user_id
=
user.id
)
}}
"
>
Profile
</a></li>
<li><a
href=
"
{{
url
(
'core:user_tools'
)
}}
"
>
Tools
</a></li>
<li><a
href=
"
{{
url
(
'core:user_list'
)
}}
"
>
Users
</a></li>
<li><a
href=
"
{{
url
(
'core:page'
,
page_name
=
"Index"
)
}}
"
>
Pages
</a></li>
<li><a
href=
"
{{
url
(
'club:club_list'
)
}}
"
>
Clubs
</a></li>
</ul>
{%
endif
%}
{%
endif
%}
{%
endblock
%}
</header>
</header>
{%
endblock
%}
<nav>
<a
href=
"
{{
url
(
'core:user_list'
)
}}
"
>
Users
</a>
<a
href=
"
{{
url
(
'core:page'
,
page_name
=
"Index"
)
}}
"
>
Pages
</a>
<a
href=
"
{{
url
(
'club:club_list'
)
}}
"
>
Clubs
</a>
</nav>
<div
id=
"content"
>
<div
id=
"content"
>
{%
if
error
%}
{%
if
error
%}
...
...
core/templates/core/page_detail.jinja
View file @
f600e174
...
@@ -11,13 +11,14 @@
...
@@ -11,13 +11,14 @@
{%
endif
%}
{%
endif
%}
<p>
You're seeing the page
<strong>
{{
page.get_display_name
()
}}
</strong>
-
<p>
You're seeing the page
<strong>
{{
page.get_display_name
()
}}
</strong>
-
<a
href=
"
{{
url
(
'core:page_hist'
,
page_name
=
page.get_full_name
())
}}
"
>
History
</a></p>
<a
href=
"
{{
url
(
'core:page_hist'
,
page_name
=
page.get_full_name
())
}}
"
>
History
</a></p>
<hr>
{%
if
rev
%}
{%
if
rev
%}
<h4>
This may not be the last update, you are seeing revision
{{
rev.id
}}
!
</h4>
<h4>
This may not be the last update, you are seeing revision
{{
rev.id
}}
!
</h4>
<h3>
{{
rev.title
}}
</h3>
<h3>
{{
rev.title
}}
</h3>
<
p
>
{{
rev.content
|
markdown
}}
</
p
>
<
div
class=
"page_content"
>
{{
rev.content
|
markdown
}}
</
div
>
{%
else
%}
{%
else
%}
<h3>
{{
page.revisions.last
()
.
title
}}
</h3>
<h3>
{{
page.revisions.last
()
.
title
}}
</h3>
<
p
>
{{
page.revisions.last
()
.
content
|
markdown
}}
</
p
>
<
div
class=
"page_content"
>
{{
page.revisions.last
()
.
content
|
markdown
}}
</
div
>
{%
endif
%}
{%
endif
%}
{%
endblock
%}
{%
endblock
%}
...
...
core/templates/core/user_detail.jinja
View file @
f600e174
...
@@ -5,24 +5,25 @@
...
@@ -5,24 +5,25 @@
{%
endblock
%}
{%
endblock
%}
{%
block
content
%}
{%
block
content
%}
<h3>
User Profile
</h3>
<div
class=
"edit-bar"
>
<p><a
href=
"
{{
url
(
'core:user_list'
)
}}
"
>
Back to list
</a></p>
<ul>
{%
if
can_edit
(
profile
,
request.user
)
or
user.id
==
profile.id
%}
{%
if
can_edit
(
profile
,
request.user
)
or
user.id
==
profile.id
%}
<li>
<a
href=
"
{{
url
(
'core:user_edit'
,
user_id
=
profile.id
)
}}
"
>
Edit
</a>
</li>
<a
href=
"
{{
url
(
'core:user_edit'
,
user_id
=
profile.id
)
}}
"
>
Edit
</a>
{%
endif
%}
{%
endif
%}
{%
if
can_edit_prop
(
profile
,
request.user
)
%}
{%
if
can_edit_prop
(
profile
,
request.user
)
%}
<li>
<a
href=
"
{{
url
(
'core:user_prop'
,
user_id
=
profile.id
)
}}
"
>
Props
</a>
</li>
<a
href=
"
{{
url
(
'core:user_prop'
,
user_id
=
profile.id
)
}}
"
>
Props
</a>
{%
endif
%}
{%
endif
%}
</
ul
>
</
div
>
<p>
<h3>
User Profile
</h3>
You're seeing the profile of
<strong>
{{
profile.get_full_name
()
}}
</strong><br/>
<strong>
{{
profile.nick_name
}}
</strong><br/>
<hr>
<em>
{{
profile.date_of_birth
|
date
(
"d/m/Y"
)
}}
</em>
<div
class=
"user_profile"
>
</p>
<h4>
{{
profile.get_full_name
()
}}
</h4>
<p>
{{
profile.nick_name
}}
</p>
<p>
Born:
{{
profile.date_of_birth
|
date
(
"d/m/Y"
)
}}
</p>
</div>
{%
if
user.membership.
filter
(
end_date
=
None
)
.
exists
()
%}
<p>
<p>
{%
if
get_subscriber
(
profile
)
.
is_subscribed
()
%}
{%
if
get_subscriber
(
profile
)
.
is_subscribed
()
%}
User is subscriber until
{{
get_subscriber
(
profile
)
.
subscriptions.last
()
.
subscription_end
}}
User is subscriber until
{{
get_subscriber
(
profile
)
.
subscriptions.last
()
.
subscription_end
}}
...
@@ -30,6 +31,7 @@ User is subscriber until {{ get_subscriber(profile).subscriptions.last().subscri
...
@@ -30,6 +31,7 @@ User is subscriber until {{ get_subscriber(profile).subscriptions.last().subscri
User is not subscribed.
<a
href=
"
{{
url
(
'subscription:subscription'
)
}}
?member=
{{
profile.id
}}
"
>
New subscription
</a>
User is not subscribed.
<a
href=
"
{{
url
(
'subscription:subscription'
)
}}
?member=
{{
profile.id
}}
"
>
New subscription
</a>
{%
endif
%}
{%
endif
%}
</p>
</p>
{%
endif
%}
{%
endblock
%}
{%
endblock
%}
...
...
core/templates/core/user_edit.jinja
View file @
f600e174
...
@@ -7,7 +7,9 @@
...
@@ -7,7 +7,9 @@
{{
form.as_p
()
}}
{{
form.as_p
()
}}
<p><input
type=
"submit"
value=
"Update"
/></p>
<p><input
type=
"submit"
value=
"Update"
/></p>
</form>
</form>
<p><a
href=
"
{{
url
(
'core:password_change'
)
}}
"
>
Change my password
</a></p>
{%
if
form.instance
==
user
%}
<p><a
href=
"
{{
url
(
'core:password_change'
)
}}
"
>
Change my password
</a></p>
{%
endif
%}
{%
endblock
%}
{%
endblock
%}
...
...
core/templates/core/user_tools.jinja
View file @
f600e174
...
@@ -6,7 +6,6 @@
...
@@ -6,7 +6,6 @@
{%
block
content
%}
{%
block
content
%}
<h3>
User Tools
</h3>
<h3>
User Tools
</h3>
<p><a
href=
"
{{
url
(
'core:user_profile'
,
user_id
=
request.user.id
)
}}
"
>
Back to profile
</a></p>
<h4>
Sith management
</h4>
<h4>
Sith management
</h4>
<ul>
<ul>
...
...
counter/templates/counter/counter_main.jinja
View file @
f600e174
...
@@ -32,7 +32,7 @@
...
@@ -32,7 +32,7 @@
<form
method=
"post"
action=
"
{{
url
(
'counter:details'
,
counter_id
=
counter.id
)
}}
"
>
<form
method=
"post"
action=
"
{{
url
(
'counter:details'
,
counter_id
=
counter.id
)
}}
"
>
{%
csrf_token
%}
{%
csrf_token
%}
{{
form.as_p
()
}}
{{
form.as_p
()
}}
<input
type=
"submit"
value=
"
CLICK"
/
>
<p>
<input
type=
"submit"
value=
"
VALIDATE"
/></p
>
</form>
</form>
{%
else
%}
{%
else
%}
<p>
Please, login
</p>
<p>
Please, login
</p>
...
@@ -48,7 +48,7 @@
...
@@ -48,7 +48,7 @@
<form
method=
"post"
action=
"
{{
url
(
'counter:login'
,
counter_id
=
counter.id
)
}}
"
>
<form
method=
"post"
action=
"
{{
url
(
'counter:login'
,
counter_id
=
counter.id
)
}}
"
>
{%
csrf_token
%}
{%
csrf_token
%}
{{
login_form.as_p
()
}}
{{
login_form.as_p
()
}}