fixed: Config::Text() returned a reference to a local variable (std::string)

added: 'static' directory with *.css and images
       we have a default layout
moved: locale from data to templates       
       notification templates have its own locale object
added: reload function reloades locale now too
added: 'nice' form of item_info in templates



git-svn-id: svn://ttmath.org/publicrep/winix/trunk@582 e52654a7-88a9-db11-a3e9-0013d4bc506e
This commit is contained in:
2010-02-15 00:31:14 +00:00
parent c58031cbf4
commit fa8d8f9ea0
38 changed files with 678 additions and 574 deletions

View File

@@ -1,79 +1,126 @@
* {
margin: 0;
border: 0;
padding: 0;
/* ---------------------- clearing -------------------------- */
html, body {
color: black;
background: white;
}
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, font, img, ins, kbd, q, s, samp,
small, strike, strong, sub, sup, tt, var,
dd, dl, dt, li, ol, ul,
fieldset, form, label, legend,
table, caption, tbody, tfoot, thead, tr, th, td {
margin: 0;
padding: 0;
border: 0;
font-weight: inherit;
font-style: inherit;
font-size: 100%;
line-height: 1.4em;
font-family: inherit;
text-align: left;
vertical-align: baseline;
}
a img, :link img, :visited img {
border: 0;
}
table {
border-collapse: collapse;
border-spacing: 0;
}
ol, ul {
list-style: none;
}
q:before, q:after,
blockquote:before, blockquote:after {
content: "";
}
/* ---------------------- index template -------------------------- */
html, body {
background: #DEDEDE;
color: #626262;
font-size: 14px;
font-family: Verdana, Tahoma, Arial CE;
line-height: 1.3em;
font-family: Verdana, Tahoma, Arial CE, Sans-Serif;
}
body.white {
background: white;
height: 100%;
}
#container {
#winix_container {
width: 909px;
margin: 10px auto 33px auto;
background: white url('/images/a2.gif') repeat-y right top;
background: white url('/winix/a2.gif') repeat-y right top;
}
#containerfull {
#winix_containerfull {
background: white;
padding: 2em;
overflow: hidden;
}
#contentleft {
#winix_contentleft {
margin: 20px 30px 0 50px;
width: 150px;
float: left;
}
* html #contentleft {
* html #winix_contentleft {
margin-left: 25px;
}
#contentleft h2 {
#winix_contentleft h2 {
margin-top: 0;
}
#contentleft h2.next {
#winix_contentleft h2.next {
margin-top: 1.2em;
}
.menu {
.winix_menu {
list-style-type: none;
margin: 0;
}
.menu li {
.winix_menu li {
width: 150px;
padding: 0 10px 2px 0;
padding: 0 12px 2px 0;
line-height: 1.5;
}
.menu li a {
.winix_menu li a {
text-decoration: none;
color: #666666;
}
.menu li a:hover, .menu li a:focus {
.winix_menu li a:hover, .winix_menu li a:focus {
text-decoration: none;
background: black;
color: white;
}
#contentright {
#winix_contentright {
min-height: 400px;
width: 600px;
float: left;
@@ -82,123 +129,127 @@ padding-right: 30px;
}
* html #contentright {
* html #winix_contentright {
height: 400px;
}
#contentfull {
#winix_contentfull {
min-height: 400px;
width: 840px;
margin: 20px 0 40px 0;
padding: 30px;
}
* html #contentfull {
* html #winix_contentfull {
height: 400px;
}
#header {
#winix_header {
height: 130px;
background: url('/images/a1.gif') no-repeat right top;
background: url('/winix/a1.gif') no-repeat right top;
overflow: hidden;
}
#header #logo {
display: block;
float: left;
width: 320px;
padding: 85px 0 0 0;
height: 0;
overflow: hidden;
background: url('/images/slimaczek.gif') no-repeat left top;
margin: 18px 0 0 28px;
}
* html #header #logo {
margin-left: 14px;
}
#header #logo:focus {
border-bottom: 2px solid black;
}
#loguj {
width: 280px;
#winix_login {
width: 240px;
float: right;
margin-top: 20px;
}
#loguj legend {
#winix_login legend {
width: 0;
height: 0;
overflow: hidden;
display: none;
}
#loguj .edit {
#winix_login .edit {
border: #848484 1px solid;
width: 100px;
font-size: 0.9em;
}
#loguj .submit {
background: white;
font-size: 0.9em;
}
#loguj p {
width: 80px;
font-size: 0.8em;
line-height: 1;
}
#winix_login .submit {
background: white;
font-size: 0.8em;
border: 0;
}
#winix_login p {
font-size: 0.7em;
margin: 0.6em 0 0.6em 0;
}
#loguj .remember {
#winix_login .remember {
margin: 0 0.5em 0 0;
vertical-align: middle;
}
#zalogowany {
#winix_logged {
width: 280px;
float: right;
margin-top: 20px;
font-size: 0.8em;
text-align: right;
padding-right: 2em;
padding-right: 30px;
}
#current_dir {
#winix_header #winix_logo {
display: block;
float: left;
list-style-type: none;
margin: 73px 0 0 0;
margin: 20px 0 5px 20px;
}
#current_dir li {
* html #winix_header #winix_logo {
margin-left: 10px;
}
#winix_current_dir {
list-style-type: none;
margin: 20px 0 0 10px;
overflow: hidden;
float: left;
}
#winix_current_dir li {
display: block;
float: left;
}
#current_dir a{
#winix_current_dir a {
text-decoration: none;
color: #666666;
font-size: 0.8em;
font-size: 1em;
}
#current_dir a:focus, #current_dir a:hover {
#winix_current_dir a:focus, #winix_current_dir a:hover {
color: white;
background: black;
}
#footer {
#winix_footer {
clear: both;
height: 40px;
background: url('/images/b.gif') no-repeat left bottom;
background: url('/winix/b.gif') no-repeat left bottom;
}
#menu2 {
#winix_menu_bottom {
font-size: 0.8em;
list-style-type: none;
margin: 0 auto 0 auto;
@@ -207,52 +258,37 @@ text-align: center;
}
#menu2 li {
#winix_menu_bottom li {
display: inline;
margin-right: 15px;
padding-right: 15px;
border-right: 1px solid #626262;
}
#menu2 li.last {
#winix_menu_bottom li.last {
margin-right: 0;
padding-right: 0;
border-right: none;
}
#menu2 li a {
#winix_menu_bottom li a {
text-decoration: none;
color: #666666;
}
#menu2 li a:hover, #menu2 li a:focus {
#winix_menu_bottom li a:hover, #winix_menu_bottom li a:focus {
text-decoration: none;
color: white;
background: black;
}
p.iteminfo {
font-size: 0.7em;
color: #AAAAAA;
margin: 0.4em 0 1.8em 0;
}
p.itemtabinfo {
font-size: 0.7em;
color: #AAAAAA;
margin: 0 0 1em 0;
padding: 0.5em 0 0 0;
}
/* ---------------------- content -------------------------- */
p.itemtabinfo2 {
font-size: 0.7em;
color: #AAAAAA;
margin: 0 0 1em 0;
padding: 1.5em 0 0 0;
}
/* ---------------------------------------------------------- */
h1 {
font-size: 1.8em;
@@ -261,6 +297,7 @@ color: #FF8700;
font-weight: normal;
}
h1.withinfo {
margin: 0 0 0 0;
}
@@ -269,7 +306,8 @@ margin: 0 0 0 0;
h1.next {
margin-top: 1.2em;
}
h2 {
font-size: 1.2em;
margin: 1.2em 0 0.8em 0;
@@ -277,6 +315,7 @@ color: #FF8700;
font-weight: normal;
}
h2.withinfo {
margin: 1.2em 0 0.2em 0;
}
@@ -287,6 +326,7 @@ color: #065A8B;
text-decoration: none;
}
a:hover, a:focus {
background: #065A8B;
color: white;
@@ -299,15 +339,41 @@ margin: 1em 0 1em 0;
line-height: 1.5em;
}
p.withnext {
margin: 1em 0 0 0;
}
p.iteminfo {
font-size: 0.7em;
color: #AAAAAA;
margin: 0.4em 0 1.8em 0;
}
p.itemtabinfo {
font-size: 0.7em;
color: #AAAAAA;
margin: 0 0 1em 0;
padding: 0.5em 0 0 0;
}
p.itemtabinfo2 {
font-size: 0.7em;
color: #AAAAAA;
margin: 0 0 1em 0;
padding: 1.5em 0 0 0;
}
.error {
color: red;
font-weight: bold;
}
cite {
font-style: normal;
}
@@ -318,6 +384,7 @@ line-height: 1.49em;
list-style-type: none;
}
ul.a li {
margin: 0.7em 0 0.7em 2em;
list-style-type: disc;
@@ -328,33 +395,23 @@ ol {
margin-left: 2.5em;
}
ol.transmitowane {
}
dt {
margin: 1em 0 0 0;
font-weight: bold;
}
dd {
margin: 0 0 1em 0;
}
#additem {
}
form legend {
display: none;
}
#additem legend {
margin: 0.5em 0 0.5em 0;
}
#additem .edit {
margin: 0.3em 0 0.3em 0;
padding: 0.2em;
@@ -363,12 +420,14 @@ display: block;
width: 530px;
}
#additem select {
border: 1px solid #dedede;
width: 100px;
margin: 0.3em 0 0.3em 0;
}
#additem select.contenttype {
border: 1px solid #dedede;
width: 150px;
@@ -384,7 +443,6 @@ width: 100px;
}
#additem .multitext {
margin: 0.5em 0 0.5em 0;
border: 1px solid #dedede;
@@ -407,6 +465,7 @@ margin: 0.5em 0 1em 0;
border-collapse: collapse;
}
table tr th {
border: 1px solid #CCCCCC;
padding: 0.3em 1em 0.3em 1em;
@@ -424,69 +483,17 @@ text-align: left;
}
table.server tr td, table.server tr th {
font-size: 0.8em;
}
table.server tr th.name {
text-align: left;
}
table.nick {
background: #A4ACAC;
color: white;
border: 0;
}
table.nick tr th, table.nick tr td {
border: 0;
font-size: 1em;
}
table.who {
font-size: 0.8em;
}
.k0 {
color: black;
}
.k1 {
color: red;
}
.k2 {
color: green;
}
.k3 {
color: yellow;
}
.k4 {
color: blue;
}
.k5 {
color: #00A6EB;
}
.k6 {
color: purple;
}
.k7 {
color: white;
}
.k8 {
color: black;
}
.k9 {
color: red;
}
table.withoutborder td {
border: 0;
padding: 0 1em 0 0;
}
div.itemoptions {
clear: both;
border-top: 1px solid #D1D1E1;
@@ -494,6 +501,7 @@ padding: 1em;
margin: 5em 0 1em 0;
}
div.itemoptions h2 {
margin-top: 0;
font-size: 1.1em;
@@ -506,44 +514,33 @@ margin: 1em 0 2em 0;
display: block;
}
/* ie6 has some problems */
* html ul.itemmenu {
overflow: visible;
height: 1em;
}
ul.itemmenu li {
display: block;
margin-right: 2em;
font-size: 0.8em;
line-height: 1.8em;
}
table.tvprogram {
font-size: 0.8em;
border: 1px solid #D1D1E1;
}
table.tvprogram td {
border: 1px solid #D1D1E1;
}
td.tvdzien {
white-space: nowrap;
}
tr.tvprogramrowcol {
background: #F3F3FF;
}
em {
font-style: normal;
font-weight: bold;
}
div.threadbox {
padding: 0.2em 1em 1em 1em;
}
div.threadboxcolor {
background: #F4F4F4;
border-radius: 8px;
@@ -556,32 +553,39 @@ table.forum {
border: 1px solid #D1D1E1;
}
table.forum th {
border: 1px solid #D1D1E1;
}
table.forum td {
border: 1px solid #D1D1E1;
}
.smallfont {
font-size: 0.7em;
}
table.ticket {
margin: 1em 0 1em 0;
}
table.ticket th {
text-align: left;
font-weight: normal;
padding: 0 1em 0 0;
}
table.ticket th, table.ticket td {
border: 0;
}
table.ticket input {
margin: 0.3em 0 0.3em 0;
padding: 0.2em;
@@ -590,15 +594,13 @@ display: block;
width: 100px;
}
div.ticketinfo {
background: #FFFED5;
padding: 2em;
border: 1px dotted #AFAFAF;
}
div.ticketinfo table {
}
div.ticketinfo table th {
text-align: left;
@@ -606,10 +608,12 @@ border: 0;
padding: 0 1em 0 0;
}
div.ticketinfo table td {
border: 0;
}
div.ticketinfo p.edit {
font-size: 0.8em;
text-align: right;
@@ -617,30 +621,6 @@ float: right;
}
form#login legend {
display: none;
}
form#login input {
margin: 0.3em 0 0.3em 0;
padding: 0.2em;
border: 1px solid #dedede;
display: block;
width: 200px;
}
form#login input.remember {
width: 1.5em;
display: inline;
}
form#login input.submit {
width: 100px;
margin: 1.5em 0 1em 0;
}
ul.ls_browse li {
display: block;
float: left;
@@ -649,3 +629,7 @@ list-style-type: none;
}
strong {
font-weight: bold;
}