Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
W
website
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Gruppo Ask
website
Commits
f7605306
Commit
f7605306
authored
Jul 12, 2012
by
Giuseppe Terrasi
Browse files
Options
Browse Files
Download
Plain Diff
parents
6eba58d8
0f29efbb
Changes
12
Show whitespace changes
Inline
Side-by-side
Showing
12 changed files
with
50 additions
and
63 deletions
+50
-63
forum/skins/light/media/style/style.css
forum/skins/light/media/style/style.css
+30
-36
forum/skins/light/media/style/user.css
forum/skins/light/media/style/user.css
+2
-2
forum/skins/light/templates/badge.html
forum/skins/light/templates/badge.html
+3
-2
forum/skins/light/templates/badges.html
forum/skins/light/templates/badges.html
+2
-2
forum/skins/light/templates/base_content.html
forum/skins/light/templates/base_content.html
+1
-1
forum/skins/light/templates/question.html
forum/skins/light/templates/question.html
+0
-3
forum/skins/light/templates/questions.html
forum/skins/light/templates/questions.html
+0
-1
forum/skins/light/templates/user.html
forum/skins/light/templates/user.html
+0
-5
forum/skins/light/templates/users/edit.html
forum/skins/light/templates/users/edit.html
+1
-1
forum/skins/light/templates/users/info.html
forum/skins/light/templates/users/info.html
+1
-1
forum/skins/light/templates/users/users.html
forum/skins/light/templates/users/users.html
+1
-1
locale/it/LC_MESSAGES/it.po
locale/it/LC_MESSAGES/it.po
+9
-8
No files found.
forum/skins/light/media/style/style.css
View file @
f7605306
...
@@ -87,12 +87,12 @@ a:hover {
...
@@ -87,12 +87,12 @@ a:hover {
text-align
:
right
;
text-align
:
right
;
}
}
.spacer3
{
/*
.spacer3 {
clear: both;
clear: both;
height: 30px;
height: 30px;
line-height: 30px;
line-height: 30px;
visibility: hidden;
visibility: hidden;
}
}
*/
h1
{
h1
{
font-size
:
160%
;
font-size
:
160%
;
...
@@ -407,13 +407,13 @@ padding-top: 4px;
...
@@ -407,13 +407,13 @@ padding-top: 4px;
}
}
#room
{
#room
{
background-color
:
#FFFFFF
;
border
:
1px
solid
#DD4814
;
border-bottom
:
1px
solid
#777777
;
background-color
:
#E7E7E7
;
padding
:
5px
;
}
}
#CALeft
{
#CALeft
{
float
:
left
;
float
:
left
;
position
:
relative
;
width
:
84%
;
width
:
84%
;
}
}
...
@@ -425,8 +425,6 @@ padding-top: 4px;
...
@@ -425,8 +425,6 @@ padding-top: 4px;
#CAFull
{
#CAFull
{
float
:
left
;
float
:
left
;
width
:
100%
;
width
:
100%
;
border
:
1px
solid
#DD4814
;
background-color
:
#E7E7E7
;
}
}
#ground
{
#ground
{
...
@@ -566,12 +564,12 @@ padding-top: 4px;
...
@@ -566,12 +564,12 @@ padding-top: 4px;
}
}
.boxC
{
.boxC
{
background
:
none
repeat
scroll
0
0
#E5EBF8
;
background-color
:
#D7D7D7
;
border-color
:
#EEEEEC
#A9ACA5
#BABDB6
#EEEEEC
;
border-left
:
1px
solid
#DD4814
;
border-style
:
solid
;
border-bottom
:
1px
solid
#DD4814
;
border-width
:
1px
;
margin-bottom
:
8px
;
padding
:
10px
;
padding
:
10px
;
margin-right
:
-5px
;
margin-top
:
-5px
;
}
}
.boxC
p
{
.boxC
p
{
...
@@ -688,11 +686,8 @@ padding-top: 4px;
...
@@ -688,11 +686,8 @@ padding-top: 4px;
}
}
.medal
{
.medal
{
background
:
none
repeat
scroll
0
0
#FFFFCD
;
background
:
none
repeat
scroll
0
0
#DD4818
;
border-color
:
#EEEEEE
#CCCCCC
#CCCCCC
#EEEEEE
;
border
:
#DD4818
solid
1px
;
border-left
:
1px
solid
#EEEEEE
;
border-style
:
solid
;
border-width
:
1px
;
color
:
#333333
;
color
:
#333333
;
font-size
:
14px
;
font-size
:
14px
;
font-weight
:
bold
;
font-weight
:
bold
;
...
@@ -702,16 +697,14 @@ padding-top: 4px;
...
@@ -702,16 +697,14 @@ padding-top: 4px;
a
.medal
{
a
.medal
{
text-decoration
:
none
;
text-decoration
:
none
;
color
:
#333333
;
color
:
white
;
}
}
a
.medal
:hover
{
a
.medal
:hover
{
background
:
url("../images/medala_on.gif")
no-repeat
scroll
0
0
transparent
;
/*background: url("../images/medala_on.gif") no-repeat scroll 0 0 transparent;*/
border-color
:
#E7E296
#D1CA3D
#D1CA3D
#E7E296
;
background-color
:
white
;
border-left
:
1px
solid
#E7E296
;
border
:
#DD4818
solid
1px
;
border-style
:
solid
;
color
:
#DD4818
;
border-width
:
1px
;
color
:
#333333
;
text-decoration
:
none
;
text-decoration
:
none
;
}
}
...
@@ -765,7 +758,7 @@ a.medal:hover {
...
@@ -765,7 +758,7 @@ a.medal:hover {
}
}
.tabsA
a
:hover
{
.tabsA
a
:hover
{
background
:
none
repeat
scroll
0
0
#
356FCB
;
background
:
none
repeat
scroll
0
0
#
DD4818
;
color
:
#FFFFFF
;
color
:
#FFFFFF
;
}
}
...
@@ -939,11 +932,15 @@ div.question-body p, div.answer-body p {
...
@@ -939,11 +932,15 @@ div.question-body p, div.answer-body p {
}
}
.badge-list
a
{
.badge-list
a
{
color
:
#
3060A
8
;
color
:
#
DD481
8
;
}
}
.badge-list
a
.medal
{
.badge-list
a
.medal
{
color
:
#333333
;
color
:
white
;
}
.badge-list
a
.medal
:hover
{
color
:
#DD4818
;
}
}
#medalList
.badgeListDescription
{
#medalList
.badgeListDescription
{
...
@@ -1282,16 +1279,13 @@ ins {
...
@@ -1282,16 +1279,13 @@ ins {
margin-left
:
0px
;
margin-left
:
0px
;
}
}
#subheader
.silver
,
.badge2
{
#top
.bronze
,
.badge3
,
#top
.silver
,
.badge2
{
float
:
left
;
line-height
:
40px
;
line-height
:
40px
;
margin-left
:
0px
;
margin-left
:
0px
;
}
}
#
subheader
.bronze
,
.badge3
{
#
top
.bronze
,
#top
.silver
{
float
:
left
;
float
:
left
;
line-height
:
40px
;
margin-left
:
0px
;
}
}
#subheader
.badgecount
{
#subheader
.badgecount
{
...
@@ -1931,8 +1925,8 @@ div.dialog, .context-menu-dropdown {
...
@@ -1931,8 +1925,8 @@ div.dialog, .context-menu-dropdown {
background-color
:
#EEEEEE
;
background-color
:
#EEEEEE
;
-moz-border-radius
:
5px
;
-moz-border-radius
:
5px
;
-webkit-border-radius
:
5px
;
-webkit-border-radius
:
5px
;
-moz-box-shadow
:
2px
2px
5px
#
3060A
8
;
-moz-box-shadow
:
2px
2px
5px
#
DD481
8
;
-webkit-box-shadow
:
2px
2px
5px
#
3060A
8
;
-webkit-box-shadow
:
2px
2px
5px
#
DD481
8
;
}
}
.context-menu-dropdown
{
.context-menu-dropdown
{
...
@@ -1964,7 +1958,7 @@ div.dialog, .context-menu-dropdown {
...
@@ -1964,7 +1958,7 @@ div.dialog, .context-menu-dropdown {
}
}
.context-menu-dropdown
li
.item
:hover
{
.context-menu-dropdown
li
.item
:hover
{
background-color
:
#
3060A
8
;
background-color
:
#
DD481
8
;
color
:
white
;
color
:
white
;
}
}
...
@@ -1999,7 +1993,7 @@ div.dialog .dialog-buttons {
...
@@ -1999,7 +1993,7 @@ div.dialog .dialog-buttons {
margin
:
0
3px
5px
3px
;
margin
:
0
3px
5px
3px
;
-moz-border-radius
:
3px
;
-moz-border-radius
:
3px
;
-webkit-border-radius
:
3px
;
-webkit-border-radius
:
3px
;
background-color
:
#
3060A
8
;
background-color
:
#
DD481
8
;
color
:
white
;
color
:
white
;
line-height
:
20px
;
line-height
:
20px
;
vertical-align
:
baseline
;
vertical-align
:
baseline
;
...
...
forum/skins/light/media/style/user.css
View file @
f7605306
...
@@ -16,8 +16,8 @@
...
@@ -16,8 +16,8 @@
background-color
:
#EEEEEE
;
background-color
:
#EEEEEE
;
-moz-border-radius
:
5px
;
-moz-border-radius
:
5px
;
-webkit-border-radius
:
5px
;
-webkit-border-radius
:
5px
;
-moz-box-shadow
:
2px
2px
5px
#
3060A
8
;
-moz-box-shadow
:
2px
2px
5px
#
DD481
8
;
-webkit-box-shadow
:
2px
2px
5px
#
3060A
8
;
-webkit-box-shadow
:
2px
2px
5px
#
DD481
8
;
}
}
div
.dialog.award-rep-points
table
{
div
.dialog.award-rep-points
table
{
...
...
forum/skins/light/templates/badge.html
View file @
f7605306
...
@@ -14,7 +14,8 @@
...
@@ -14,7 +14,8 @@
</script>
</script>
{% endblock %}
{% endblock %}
{% block content %}
{% block content %}
<div
id=
"main-bar"
class=
"headNormal"
>
<div
id=
"mainbar-full"
>
<div
class=
"headUser"
>
{% trans "Badge" %}
{% trans "Badge" %}
</div>
</div>
<div
id=
"main-body"
style=
"width:100%;margin-bottom:20px"
>
<div
id=
"main-body"
style=
"width:100%;margin-bottom:20px"
>
...
@@ -32,7 +33,7 @@
...
@@ -32,7 +33,7 @@
<p
style=
"width:220px;float:left"
>
{% user_signature award.user "badges" %}
<span
class=
"tag-number"
>
×
{{ award.count|intcomma }}
</span></p>
<p
style=
"width:220px;float:left"
>
{% user_signature award.user "badges" %}
<span
class=
"tag-number"
>
×
{{ award.count|intcomma }}
</span></p>
{% endfor %}
{% endfor %}
</div>
</div>
</div>
</div>
</div>
{% endblock %}
{% endblock %}
<!-- end template badge.html -->
<!-- end template badge.html -->
forum/skins/light/templates/badges.html
View file @
f7605306
...
@@ -5,8 +5,8 @@
...
@@ -5,8 +5,8 @@
{% load i18n %}
{% load i18n %}
{% block title %}{% spaceless %}{% trans "Badges summary" %}{% endspaceless %}{% endblock %}
{% block title %}{% spaceless %}{% trans "Badges summary" %}{% endspaceless %}{% endblock %}
{% block content %}
{% block content %}
<div
class=
"head
lineA
"
>
<div
class=
"head
User
"
>
<span
class=
"headMedals"
>
{% trans "Badges" %}
</span>
{% trans "Badges" %}
</div>
</div>
<div
class=
"badges"
id=
"main-body"
style=
"width:100%"
>
<div
class=
"badges"
id=
"main-body"
style=
"width:100%"
>
<p>
<p>
...
...
forum/skins/light/templates/base_content.html
View file @
f7605306
...
@@ -95,7 +95,7 @@
...
@@ -95,7 +95,7 @@
{% endblock %}
{% endblock %}
</div>
</div>
</div>
</div>
<
div
class=
"spacer3"
></div
>
<
!--<div class="spacer3"></div>--
>
</div>
</div>
{% endblock %}
{% endblock %}
{% if settings.USE_CUSTOM_FOOTER|or_preview:request %}
{% if settings.USE_CUSTOM_FOOTER|or_preview:request %}
...
...
forum/skins/light/templates/question.html
View file @
f7605306
...
@@ -284,8 +284,6 @@
...
@@ -284,8 +284,6 @@
{% markdown_help %}
{% markdown_help %}
{% sidebar_upper %}
{% cache 60 questions_tags settings.APP_URL question.id %}
{% cache 60 questions_tags settings.APP_URL question.id %}
<div
class=
"boxC"
>
<div
class=
"boxC"
>
<p>
<p>
...
@@ -310,7 +308,6 @@
...
@@ -310,7 +308,6 @@
</p>
</p>
</div>
</div>
{% endcache %}
{% endcache %}
{% sidebar_lower %}
<div
class=
"boxC"
>
<div
class=
"boxC"
>
<h3
class=
"subtitle"
>
{% trans "Related questions" %}
</h3>
<h3
class=
"subtitle"
>
{% trans "Related questions" %}
</h3>
<div
class=
"questions-related"
>
<div
class=
"questions-related"
>
...
...
forum/skins/light/templates/questions.html
View file @
f7605306
...
@@ -41,7 +41,6 @@
...
@@ -41,7 +41,6 @@
{% block sidebar %}
{% block sidebar %}
{% include "question_list/count.html" %}
{% include "question_list/count.html" %}
{% tag_selector %}
{% tag_selector %}
{% sidebar_lower %}
{% question_list_related_tags questions.paginator.page %}
{% question_list_related_tags questions.paginator.page %}
{% endblock %}
{% endblock %}
...
...
forum/skins/light/templates/user.html
View file @
f7605306
...
@@ -26,11 +26,6 @@
...
@@ -26,11 +26,6 @@
<link
rel=
"stylesheet"
href=
"http://static.jquery.com/ui/css/demo-docs-theme/ui.theme.css"
type=
"text/css"
media=
"all"
/>
<link
rel=
"stylesheet"
href=
"http://static.jquery.com/ui/css/demo-docs-theme/ui.theme.css"
type=
"text/css"
media=
"all"
/>
<link
rel=
"stylesheet"
type=
"text/css"
media=
"screen"
href=
"{% media "
/
media
/
style
/
user
.
css
"
%}"
/>
<link
rel=
"stylesheet"
type=
"text/css"
media=
"screen"
href=
"{% media "
/
media
/
style
/
user
.
css
"
%}"
/>
{% endif %}
{% endif %}
<style
type=
"text/css"
>
#room
{
border
:
0
;
}
</style>
{% block userjs %}{% endblock %}
{% block userjs %}{% endblock %}
{% endblock %}
{% endblock %}
{% block content %}
{% block content %}
...
...
forum/skins/light/templates/users/edit.html
View file @
f7605306
...
@@ -30,7 +30,7 @@
...
@@ -30,7 +30,7 @@
{% endblock %}
{% endblock %}
{% block content %}
{% block content %}
<div
id=
"mainbar-full"
>
<div
id=
"mainbar-full"
>
<div
id=
"subheader"
class=
"headUser"
>
<div
class=
"headUser"
>
{{ user.username }} - {% trans "edit profile" %}
{{ user.username }} - {% trans "edit profile" %}
</div>
</div>
<div
id=
"main-body"
style=
"width:100%"
>
<div
id=
"main-body"
style=
"width:100%"
>
...
...
forum/skins/light/templates/users/info.html
View file @
f7605306
...
@@ -7,7 +7,7 @@
...
@@ -7,7 +7,7 @@
{% load markup %}
{% load markup %}
{% load user_tags %}
{% load user_tags %}
<div
id=
"subheader"
class=
"headUser{% if view_user.is_suspended %} suspended-user{% endif %}"
>
<div
class=
"headUser{% if view_user.is_suspended %} suspended-user{% endif %}"
>
{{view_user.decorated_name}}
{{view_user.decorated_name}}
</div>
</div>
<table
class=
"user-info-table"
width=
"100%"
>
<table
class=
"user-info-table"
width=
"100%"
>
...
...
forum/skins/light/templates/users/users.html
View file @
f7605306
...
@@ -20,7 +20,7 @@
...
@@ -20,7 +20,7 @@
{% endblock %}
{% endblock %}
{% block content %}
{% block content %}
<div
class=
"tabBar"
>
<div
class=
"tabBar"
>
<div
class=
"headUser
s
"
>
{% trans "Users" %}
</div>
<div
class=
"headUser"
>
{% trans "Users" %}
</div>
{{ users.paginator.sort_tabs }}
{{ users.paginator.sort_tabs }}
</div>
</div>
<div
id=
"main-body"
style=
"width:100%"
>
<div
id=
"main-body"
style=
"width:100%"
>
...
...
locale/it/LC_MESSAGES/it.po
View file @
f7605306
...
@@ -8,15 +8,15 @@ msgstr ""
...
@@ -8,15 +8,15 @@ msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2012-04-02 14:15-0700\n"
"POT-Creation-Date: 2012-04-02 14:15-0700\n"
"PO-Revision-Date: 2012-07-
09 20:42
+0000\n"
"PO-Revision-Date: 2012-07-
10 21:00
+0000\n"
"Last-Translator: Milo Casagrande <milo.casagrande@gmail.com>\n"
"Last-Translator: Milo Casagrande <milo.casagrande@gmail.com>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
"MIME-Version: 1.0\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=n != 1;\n"
"Plural-Forms: nplurals=2; plural=n != 1;\n"
"X-Launchpad-Export-Date: 2012-07-1
0 05:55
+0000\n"
"X-Launchpad-Export-Date: 2012-07-1
1 05:36
+0000\n"
"X-Generator: Launchpad (build 155
58
)\n"
"X-Generator: Launchpad (build 155
93
)\n"
"Language: \n"
"Language: \n"
"X-Translated-Using: django-rosetta 0.5.3\n"
"X-Translated-Using: django-rosetta 0.5.3\n"
...
@@ -507,7 +507,7 @@ msgstr ""
...
@@ -507,7 +507,7 @@ msgstr ""
#: forum/actions/meta.py:39
#: forum/actions/meta.py:39
#, python-format
#, python-format
msgid "%(user)s %(vote_desc)s %(post_desc)s"
msgid "%(user)s %(vote_desc)s %(post_desc)s"
msgstr ""
msgstr "
%(user)s %(vote_desc)s %(post_desc)s
"
#: forum/actions/meta.py:58
#: forum/actions/meta.py:58
msgid "voted up"
msgid "voted up"
...
@@ -655,6 +655,8 @@ msgstr ""
...
@@ -655,6 +655,8 @@ msgstr ""
#, python-format
#, python-format
msgid "%(user)s converted comment on %(question)s to a new question"
msgid "%(user)s converted comment on %(question)s to a new question"
msgstr ""
msgstr ""
"Un commento su %(question)s è stato convertito in una nuova domanda (utente: "
"%(user)s)"
#: forum/actions/node.py:231
#: forum/actions/node.py:231
msgid "converted to question"
msgid "converted to question"
...
@@ -673,7 +675,7 @@ msgstr "reso wiki"
...
@@ -673,7 +675,7 @@ msgstr "reso wiki"
#: forum/actions/node.py:274
#: forum/actions/node.py:274
#, python-format
#, python-format
msgid "%(user)s marked %(node)s as community wiki."
msgid "%(user)s marked %(node)s as community wiki."
msgstr ""
msgstr "
L'elemento %(node)s è stato segnalato come wiki (utente: %(user)s)
"
#: forum/actions/page.py:6
#: forum/actions/page.py:6
msgid "created"
msgid "created"
...
@@ -3495,9 +3497,8 @@ msgid ""
...
@@ -3495,9 +3497,8 @@ msgid ""
"As a registered user you can login with your OpenID, log out of the site or "
"As a registered user you can login with your OpenID, log out of the site or "
"permanently remove your account."
"permanently remove your account."
msgstr ""
msgstr ""
"Clicking <strong>Logout</strong> will log you out from the forum, but will "
"Come utente registrato puoi eseguire l'accesso via OpenID, terminare la "
"not sign you off from your OpenID provider.</p><p>If you wish to sign off "
"sessione sul sito o eliminare il tuo account."
"completely - please make sure to log out from your OpenID provider as well."
#: forum/skins/default/templates/logout.html:20
#: forum/skins/default/templates/logout.html:20
#: forum/skins/nuxeo/templates/logout.html:20
#: forum/skins/nuxeo/templates/logout.html:20
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment