diff --git a/CHANGES b/CHANGES index 61bd801..f15945b 100755 --- a/CHANGES +++ b/CHANGES @@ -1,5 +1,9 @@ ## Changes +#### 0.8.6 + + * new calendar view + #### 0.8.5 * servers view diff --git a/Gemfile b/Gemfile index f975baa..dada564 100755 --- a/Gemfile +++ b/Gemfile @@ -6,5 +6,5 @@ gem 'mysql2' , '~>0.2.7' gem 'will_paginate', '~> 3.0.beta' gem 'themes_for_rails' gem "ezcrypto", "~> 0.7.2" -gem "calendar_view", "~> 0.0.4" +gem "calendar_view", "~> 0.0.5" gem 'bluecloth', '>= 2.0.0' diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb index f3f1f92..b104f7d 100755 --- a/app/helpers/application_helper.rb +++ b/app/helpers/application_helper.rb @@ -41,7 +41,7 @@ end def show_param_view(object,field,value) model_name = eval(object.class.model_name) html = "" - html << "
" + html = "" #html << text.gsub!(/\r\n/,"\n") html << h(text) html << "" diff --git a/config/defaults.yml b/config/defaults.yml index 363000d..c34bb05 100755 --- a/config/defaults.yml +++ b/config/defaults.yml @@ -1,4 +1,4 @@ -version: 0.8.5 +version: 0.8.6 theme: olive locale: pl diff --git a/config/locales/pl.yml b/config/locales/pl.yml index b54c2b5..4f19ca4 100755 --- a/config/locales/pl.yml +++ b/config/locales/pl.yml @@ -211,3 +211,4 @@ pl: version: Wersja set: Ustaw no_file_chosen: Nie wybrano żadnego pliku + calendar: Kalendarz diff --git a/themes/olive/stylesheets/base.css b/themes/olive/stylesheets/base.css deleted file mode 100755 index 42f711a..0000000 --- a/themes/olive/stylesheets/base.css +++ /dev/null @@ -1,402 +0,0 @@ -* {margin:0;padding:0} -.clear { clear: both; height: 0; } - -.wat-cf:after { - content: "."; - display: block; - height: 0; - clear: both; - visibility: hidden; -} - -.wat-cf {display: inline-block;} - -/* Hides from IE-mac \*/ -* html .wat-cf {height: 1%;} -.wat-cf {display: block;} -/* End hide from IE-mac */ - -h1 { margin: 15px 0; font-size: 10px; font-weight: normal; } -h2 { font-size: 22px; margin: 7px 0; font-weight: normal;} -h3 { font-size: 18px; margin: 5px 0; font-weight: normal;} -h4 { font-size: 16px; margin: 5px 0; font-weight: normal;} -hr {height: 1px; border: 0; } -p { margin: 15px 0;} -a img { border: none; } - -body { - font-size: 12px; - font-family: sans-serif; -} - -#container { - min-width: 960px; -} - -#header, #wrapper { - padding: 0 20px; -} - -#header { - position: relative; - padding-top: 1px; -} - -#header h1 { - margin: 0; - padding: 10px 0; - font-size: 26px; -} - -#header h1 a:link, #header h1 a:active, #header h1 a:hover, #header h1 a:visited { - text-decoration: none; -} - -#main { - width: 960px; - float: left; -} - -.actions-bar { - padding: 5px 1px; -} - -.actions-bar .actions { - float: left; -} - - -.actions-bar .pagination { - float: right; - padding: 1px 0; -} - -#sidebar { - width: 250px; - float: left; - margin-right: 10px; -} - -#sidebar h3 { - padding: 10px 15px; - margin: 0; - font-size: 13px; -} - -#sidebar .block { - margin-bottom: 10px; - padding-bottom: 1px; -} - -#sidebar .block .content { - padding: 5px; -} - -#sidebar ul.navigation li { - padding: 3px; -} - -#sidebar .block .sidebar-block, #sidebar .notice { - padding:10px; -} - -#wrapper { - padding-top: 20px; -} - -#main .block { - margin-bottom: 20px; - padding-top: 1px; -} - -#main .block .content .inner { - padding: 5px; -} - -#main .main p.first { - margin-top: 0; -} - -#user-navigation { - position: absolute; - top: 0px; - right: 20px; -} - -#main-navigation { - width: 100%; -} - -#user-navigation ul, #main-navigation ul, .secondary-navigation ul, #sidebar ul.navigation { - margin: 0; - padding: 0; - list-style-type: none; -} - -#user-navigation ul li, #main-navigation ul li, .secondary-navigation ul li { - float: left; -} - -#main-navigation ul li { - margin-right: 5px; -} - -#user-navigation ul li { - padding: 5px 10px; -} - -#main-navigation ul li a:link, #main-navigation ul li a:visited, #main-navigation ul li a:hover, #main-navigation ul li a:active, -.secondary-navigation ul li a:link, .secondary-navigation ul li a:visited, .secondary-navigation ul li a:hover, .secondary-navigation ul li a:active, -#user-navigation ul li a:link, #user-navigation ul li a:visited, #user-navigation ul li a:hover, #user-navigation ul li a:active { - text-decoration: none; -} - -#main-navigation ul li a { - font-size: 14px; - line-height: 14px; - display: block; - padding: 8px 15px; -} - -.secondary-navigation { - font-size: 13px; - border-bottom-width: 10px; - border-bottom-style: solid; -} - -.secondary-navigation ul li a { - display: block; - padding: 10px 15px; -} - -#footer { - padding-bottom: 20px; -} - -/* pagination */ - -.pagination a, .pagination span, .pagination em { - padding: 2px 5px; - margin-right: 5px; - display: block; - float: left; - border-style: solid; - border-width: 1px; -} - -.pagination em { - font-weight: bold; -} - -.pagination a { - text-decoration: none; -} - -/* tables */ -.table { - width: 100%; - border-collapse: collapse; - margin: 5px 0; -} - -.table th { - padding: 5px; - font-weight: bold; - text-align: left; -} - -.table th.first { - width: 30px; -} - -.table th.last { - width: 200px; -} - -.table .checkbox { - margin-left: 10px; -} - -.table td { - padding: 2px 10px; - color: #5E634E; -} - -.table td.last { - text-align: right; -} - -/* forms */ - -input.checkbox { - margin: 0; - padding: 0; -} - -.form .group { - margin-bottom: 15px; -} - -.form div.left { - width: 20%; - float: left; -} - -.form div.right { - width: 70%; - float: right; -} - -.columns .column { - width: 48%; -} - -.columns .left { - float: left; -} - -.columns .right { - float: right; -} - -.form label.label, .form input.text_field, .form textarea.text_area { - font-size: 1.2em; - padding: 1px 0; - margin: 0; -} - -.form label.right { - text-align: right; -} - -.form input.checkbox, .form input.radio { - margin-right: 5px; -} - -.form label.checkbox, .form label.radio { - line-height: 1.5em; -} - -.form label.label { - display: block; - padding-bottom: 2px; - font-weight: bold; -} - -.form div.fieldWithErrors label.label { - display: inline; -} - -.form .fieldWithErrors .error { - color: red; -} - -.form input.text_field, .form textarea.text_area { - width: 100%; - border-width: 1px; - border-style: solid; -} - -/* lists */ - -ul.list { - margin: 0; - padding: 0; - list-style-type: none; -} - -ul.list li { - clear: left; - padding-bottom: 5px; -} - -ul.list li .left { - float: left; -} - -ul.list li .left .avatar { - width: 50px; - height: 50px; -} - -ul.list li .item { - margin-left: 80px; -} - -ul.list li .item .avatar { - float: left; - margin: 0 5px 5px 0; - width: 30px; - height: 30px; -} - -/* box */ - -#box { - width: 500px; - margin: 20px auto; -} - -#box .block { - margin-bottom: 20px; -} - -#box .block h2 { - padding: 10px 15px; - margin: 0; -} - -#box .block .content { - padding: 10px 20px; -} - -/* Inspired by http://particletree.com/features/rediscovering-the-button-element */ - -a.button:link, a.button:visited, a.button:hover, a.button:active, button.button { - color: #222; - display:block; - float:left; - margin:0 7px 0 0; - background-color: #eee; - border:1px solid #bfbfbf; - font-size: 1em; - line-height: 1.3em; - font-weight:bold; - cursor:pointer; - padding:2px 5px 3px 3px; - text-decoration: none; -} - -button.button { - width:auto; - overflow:visible; - padding:2px 5px 1px 3px; /* IE6 */ -} -button.button[type] { - padding:2px 5px 2px 3px; /* Firefox */ - line-height:17px; /* Safari */ -} - -*:first-child+html button.button[type] { - padding:2px 5px 1px 3px; /* IE7 */ -} - -button.button img, a.button img { - margin:0 6px -4px 0 !important; - padding:0; - border:none; - width:18px; - height:18px; -} - -button.button:hover, a.button:hover { - background-color:#dedede; -} - -button.button:active, a.button:active { - background-color:#e5e5e5; -} - -div.block h3 a { - color: white; -} diff --git a/themes/olive/stylesheets/olive.css b/themes/olive/stylesheets/olive.css new file mode 100755 index 0000000..c362196 --- /dev/null +++ b/themes/olive/stylesheets/olive.css @@ -0,0 +1,556 @@ +* { + margin:0; + padding:0; +} + +body { + font-size: 12px; + color: #222; + background: #EFF3E4; + font-family: sans-serif; +} + +h1 { margin: 15px 0; font-size: 10px; font-weight: normal; } +h3 { font-size: 14px; font-weight: normal;} +h4 { font-size: 16px; margin: 5px 0; font-weight: normal;} +hr {height: 1px; border: 0; } +p { margin: 15px 0;} +a img { border: none; } + +.clear { + clear: both; + height: 0; +} + +#container { + min-width: 960px; +} + +#sidebar { + width: 250px; + float: left; + margin-left: 5px; + padding: 0 5px; + margin-right: 5px; +} + +#main { + width: 960px; + float: left; + margin-top: 10px; +} + +.width100 { + width: 100%; +} + +div.logo { + text-align: center; + margin: 10px; +} + +p.version { + color: #5E634E; + text-align: center; + font-size: 14px; +} + +.block { + margin: 0 0 10px 0; + padding-bottom: 1px; +} + +.block .content { + padding-left: 5px; + padding-right: 5px; + background-color: white; + border-bottom-left-radius: 5px; + border-bottom-right-radius: 5px; +} + +.block h3 { + background: #5E634E; + color: #FFF; + border-bottom: 6px solid #DACF77; + padding: 6px 10px; + -moz-border-radius-topleft: 5px; + -webkit-border-top-left-radius: 5px; + -moz-border-radius-topright: 5px; + -webkit-border-top-right-radius: 5px; +} + +#user-navigation ul, #navigation-tabs ul, .navigation-tabs ul, #sidebar ul.navigation { + list-style-type: none; + margin: 0; + padding: 0; +} + +ul.folders { + font-size: 14px; +} + +ul.navigation { + color: #A3AB74; +} + +#sidebar ul.navigation li { + padding: 3px; +} + +#sidebar ul li { + border-bottom: 1px solid #F0F0EE; +} + +ul li a:link, ul li a:visited { + background: none repeat scroll 0 0 #FFFFFF; + text-decoration: none; +} +a:link, a:visited, a:hover, a:active, h1, h2, h3 { + color: #A3AB74; + text-decoration: none; +} + +li.selected { + color: #5E634E; + font-weight: bold; +} + +.navigation-tabs { + border-top-left-radius: 4px; + border-top-right-radius: 4px; + background: none repeat scroll 0 0 #5E634E; + border-bottom: 6px solid #DACF77; + font-size: 14px; +} + +.navigation-tabs ul { + list-style-type: none; + margin: 0; + padding: 0; + display: block; +} + +.navigation-tabs ul li.first { + border-top-left-radius: 4px; +} + +.navigation-tabs li.first a, .navigation-tabs ul li.first, .table th.first, .table th.first { + border-top-left-radius: 4px; +} + + +.navigation-tabs ul li { + float: left; +} + +.navigation-tabs ul li a:link, .navigation-tabs ul li a:visited, .navigation-tabs ul li a:hover, .navigation-tabs ul li a:active { + color: #FFFFFF; + text-decoration: none; + background: none repeat scroll 0 0 #5E634E; +} + +.navigation-tabs ul li.active a:link, .navigation-tabs ul li.active a:visited, .navigation-tabs ul li.active a:hover, .navigation-tabs ul li.active a:active{ + background-color: #DACF77; +} + +.navigation-tabs ul li a { + padding: 8px 12px; + display: block; + padding: 10px 15px; +} + +.secondary { + padding-top: 15px; +} + +div.actiongroup { + display: block; + margin: 5px 0; + padding: 2px 0; +} + +button.button[type] { + line-height: 17px; + padding: 2px 5px 2px 3px; +} + +button.button { + overflow: visible; + padding: 2px 5px 1px 3px; + width: auto; +} + +a.button:link, a.button:visited, a.button:hover, a.button:active, button.button { + background-color: #EEEEEE; + border: 1px solid #BFBFBF; + color: #222222; + cursor: pointer; + display: block; + float: left; + font-size: 1em; + font-weight: bold; + line-height: 1.3em; + margin: 0 7px 0 0; + padding: 2px 5px 3px 3px; + text-decoration: none; +} + +button.button img, a.button img { + border: medium none; + height: 18px; + margin: 0 6px -4px 0 !important; + padding: 0; + width: 18px; +} + +.box { + margin: 20px auto; + width: 500px; +} + +#footer { + color: grey; + text-align: center; +} + +#footer { + padding-bottom: 20px; +} + +.box .box2 h2 { + background: none repeat scroll 0 0 #869453; + color: #FFFFFF; + border-top-left-radius: 4px; + border-top-right-radius: 4px; + margin: 0; + padding: 10px 15px; +} + +.box .box2 .content { + padding: 10px 20px 30px 20px; + background-color: white; +} + +.box .box2 .group { + padding: 15px; +} + +.box .left { + float: left; + width: 20%; +} + +.box .right { + float: right; + width: 70%; +} + +.box label.label { + display: block; + font-weight: bold; + padding-bottom: 2px; +} + +.box label.right { + text-align: right; +} + +.box label.label, .box input.text_field, .box textarea.text_area { + font-size: 1.2em; + margin: 0; + padding: 1px 0; +} + +.flash .message { + -moz-border-radius: 3px; + -webkit-border-radius: 3px; + text-align:center; + margin: 0 auto 15px; + +} + +.flash .message p { + margin:8px; +} +.flash .error { + border: 1px solid #fbb; + background-color: #fdd; +} +.flash .warning { + border: 1px solid #fffaaa; + background-color: #ffffcc; +} +.flash .notice { + border: 1px solid #1FDF00; + background-color: #BBFFB6; +} + +.box div.logo { + margin: 10px; + text-align: left; +} + +.ops { + padding: 5px; + margin-bottom: 5px; +} + +div.actions-bar div.header_info { + color: #5E634E; + float: left; + font-size: 14px; + font-weight: normal; + margin: 0 10px; +} + +div.block div.actions-bar { + margin: 5px; +} + +.actions-bar { + padding: 5px 1px; +} + + +.clearfix:after { + content: "."; + display: block; + height: 0; + clear: both; + visibility: hidden; + } + +.actions-bar .pagination { + float: right; + padding: 1px 0; +} + +.pagination span.disabled { + color: #bbb; + border-color: #bbb; +} + +.pagination em { + background: #869453; + color: #FFF; + border-color: #869453; +} + +.pagination a, .pagination span { + color: #869453; + border-color: #869453; +} + +.pagination a:hover { + color: #FFF; + background: #869453; +} + +.pagination a, .pagination span, .pagination em { + padding: 2px 5px; + margin-right: 5px; + display: block; + float: left; + border-style: solid; + border-width: 1px; +} + +.pagination em { + font-weight: bold; +} + +.pagination a { + text-decoration: none; +} + +input, select, textarea { + background-color: #EFF3E4; + border: 1px solid #5E634E; + margin: 3px 0; +} + +.table { + border-collapse: collapse; + margin: 5px; + width: 99%; +} + +.table th.first { + width: 30px; +} + +.table th { + background: none repeat scroll 0 0 #5E634E; + color: #FFFFFF; +} + +.table th { + font-weight: bold; + padding: 5px; + text-align: left; +} + +th a.header { + color: white; +} + +.table th.last { + border-top-right-radius: 4px; +} + +.table th.last { + width: 30px; +} + +.table tr.even { + background: none repeat scroll 0 0 #EFF3E4; +} + +.table td { + border-bottom: 1px solid #F0F0EE; +} + +.table td { + color: #5E634E; + padding: 2px 10px; +} + +div.msg_header { + font-size: 14px; + padding: 5px; +} + +div.msg_header div.group { + margin: 5px 0; +} + +div.msg_header label { + display: inline; + float: left; + font-weight: bold; + margin-right: 10px; + text-align: right; + width: 100px; +} + +div.render_text { + font-size: 14px; + margin: 5px; +} + +div.render_text pre { + background-color: #EFF3E4; + border: 1px solid #5E634E; + font-size: 12px; + margin: 5px 0; + padding: 5px; + white-space: pre-wrap; + word-wrap: break-word; +} + +div.attachments { + margin: 10px 0 5px; +} + +div.attachments span.title { + padding: 0 0 10px 5px; + font-size: 14px; + font-weight: bold; +} + +iframe { + height: 800px; + margin-top: 10px; + width: 937px; +} + +.block .content h2 { + font-size: 22px; + font-style: normal; + font-weight: bold; + letter-spacing: -1px; + line-height: 1.2em; + margin-left: 15px; + padding: 5px; +} + +.block .content .inner { + padding: 0 5px 5px 5px; +} + +div.param_group { + font-size: 14px; + margin: 5px 0; + padding: 3px 0; +} + +div.param_group label.label { + font-weight: bold; + margin-right: 5px; +} + +div.params input, div.params select, div.params textarea { + width: 100%; +} +style.css (wiersz 529) +div.params input, div.params textarea, div.params select { + border: 1px solid #CFCFCF; +} + +div.params div.group .description, div.params div.param_group .description { + color: #8C8C8C; + font-size: 10px; + font-style: italic; +} + +div.params div.group { + margin-bottom: 10px; +} + +div.params div.group div.fieldWithErrors label.label, div.params div.group label.label { + font-size: 14px; + font-weight: bold; +} + +div.fileselect { + margin-top: 5px; + padding: 5px 0; +} + +.columns .right { + float: right; +} + +.columns .left { + float: left; +} + +.columns .column { + width: 48%; +} + +.clearfix:after { + content: "."; + display: block; + height: 0; + clear: both; + visibility: hidden; +} + +.content ul { + margin-left: 20px; +} + +.md { + margin-bottom:10px; +} + + + + diff --git a/themes/olive/stylesheets/style.css b/themes/olive/stylesheets/style.css deleted file mode 100755 index 3a8ac2a..0000000 --- a/themes/olive/stylesheets/style.css +++ /dev/null @@ -1,612 +0,0 @@ -.small { - font-size: 11px; - font-style: normal; - font-weight: normal; - text-transform: normal; - letter-spacing: normal; - line-height: 1.4em; -} - -.gray { - color:#999999; - font-family: Georgia, serif; - font-size: 13px; - font-style: italic; - font-weight: normal; - text-transform: normal; - letter-spacing: normal; - line-height: 1.6em; -} - -.hightlight { - background-color: #ffff88; - font-weight: bold; - color: #36393d; -} - -a:link, a:visited, a:hover, a:active, h1, h2, h3 { color: #A3AB74; } - -#sidebar ul li.selected a { color: #5E634E; } - -a { -moz-outline: none; } - -body { - color: #222; - background: #EFF3E4; - font-family: helvetica,Arial,sans-serif; -} - -hr { - background: #f0f0ee; - color: #f0f0ee; -} - -p { - margin: 10px 0; - -} - -#header { - background: #5E634E; -} - -#header h1 { - padding: 15px 0; - font-size: 28px; - font-style: normal; - font-weight: bold; - text-transform: normal; - letter-spacing: -1px; - line-height: 1.2em; -} - -#header h1 a:link, #header h1 a:active, #header h1 a:hover, #header h1 a:visited { - color: #FFF; -} - -#user-navigation { - top: auto; - bottom: 5px; - right: 25px; -} - -#main .block .content { - background: #FFF; - padding: 10px; -} - -#main .block .content h2 { - margin-left: 15px; -} - -#main .block .content p { - font-size:13px; - line-height:1.45em; -} - -#main .block .content h2 { - font-size:22px; - font-style:normal; - font-weight:bold; - letter-spacing:-1px; - line-height:1.2em; - margin-left:15px; -} - -#sidebar .block { - background: #FFF; -} - -#sidebar .notice { - background: #869453; - color: #fff; -} - -#sidebar h3 { - background: #5E634E; - color: #FFF; - border-bottom: 6px solid #DACF77; -} - -#main-navigation ul li { - padding-left: 15px; -} - -#main-navigation ul li a { - padding: 8px 0; -} - -#main-navigation ul li.active { - padding: 0; - margin-left: 15px; -} - -#main-navigation ul li.active { - margin-left: 15px; -} - -#main-navigation ul li.active a { - padding: 8px 15px; -} - -#sidebar ul li a:link, #sidebar ul li a:visited { - background: #FFF; - text-decoration: none; -} - -#sidebar ul li { - border-bottom: 1px solid #F0F0EE; -} - -#sidebar ul li a:hover, #sidebar ul li a:active { - background: #ADBFD6; - color: #FFF; -} - -#main-navigation { - background: #DACF77; -} - -#main-navigation ul li { - background: #DACF77; - margin-right: 0; -} - -#main-navigation ul li.active { - background: #EFF3E4; -} - -#main-navigation ul li a:link, #main-navigation ul li a:visited, #main-navigation ul li a:hover, #main-navigation ul li a:active, -.secondary-navigation ul li a:link, .secondary-navigation ul li a:visited, .secondary-navigation ul li a:hover, .secondary-navigation ul li a:active, -#user-navigation ul li a:link, #user-navigation ul li a:visited, #user-navigation ul li a:hover, #user-navigation ul li a:active { - text-decoration: none; - color: #FFF; -} - -#user-navigation a.logout { - background: #cc0000; - padding: 2px 6px; - -moz-border-radius: 4px; - -webkit-border-radius: 3px; -} - -.secondary-navigation li a:hover { - background: #ADBFD6; -} - -#main-navigation ul li.active a:link, #main-navigation ul li.active a:visited, #main-navigation ul li.active a:hover, #main-navigation ul li.active a:active { - color: #262626; -} - -.secondary-navigation { - background: #5E634E; - border-bottom: 6px solid #DACF77; -} - -.secondary-navigation ul li.active, .secondary-navigation ul li.active a:hover { - background-color: #DACF77; -} - -.secondary-navigation ul li a { - padding:8px 12px; -} - -#footer .block { - color: #FFF; - background: #262626; -} - -#footer .block p { - margin: 0; - padding: 10px; -} - -/* pagination */ - -.pagination span.disabled { - color: #bbb; - border-color: #bbb; -} - -.pagination em { - background: #869453; - color: #FFF; - border-color: #869453; -} - -.pagination a, .pagination span { - color: #869453; - border-color: #869453; -} - -.pagination a:hover { - color: #FFF; - background: #869453; -} - -/* tables */ - -.table th { - background: #5E634E; - color: #FFF; -} - -.table td { - border-bottom:1px solid #F0F0EE; -} - -.table tr.even { - background: #EFF3E4; -} -/* forms */ - -.form input.text_field, .form textarea.text_area { - border:1px solid #CFCFCF; -} - -.form input.button { - background: #EEE; - color: #262626; - padding: 2px 5px; - border: 1px solid #262626; - cursor: pointer; -} - -.form .description { - font-style: italic; - color: #8C8C8C; - font-size: .9em; -} - -/* flash-messages */ -.flash .message { - -moz-border-radius: 3px; - -webkit-border-radius: 3px; - text-align:center; - margin: 0 auto 15px; - -} - -.flash .message p { - margin:8px; -} -.flash .error { - border: 1px solid #fbb; - background-color: #fdd; -} -.flash .warning { - border: 1px solid #fffaaa; - background-color: #ffffcc; -} -.flash .notice { - border: 1px solid #1FDF00; - background-color: #BBFFB6; -} - -/* lists */ - -ul.list li { - border-bottom-color: #F0F0EE; - border-bottom-width: 1px; - border-bottom-style: solid; -} - -ul.list li .item .avatar { - border-color: #F0F0EE; - border-width: 1px; - border-style: solid; - padding: 2px; -} - -/* box */ - -#box .block { - background: #FFF; -} - -#box .block h2 { - background: #869453; - color: #FFF; -} - - -/* rounded borders */ - -#main, #main-navigation, #main-navigation li, .secondary-navigation, #main .block, #sidebar .block, #sidebar h3, ul.list li, -#footer .block, .form input.button, #box .block, #box .block h2 { - -moz-border-radius-topleft: 4px; - -webkit-border-top-left-radius: 4px; - -moz-border-radius-topright: 4px; - -webkit-border-top-right-radius: 4px; -} - -.secondary-navigation li.first a, .secondary-navigation ul li.first, .table th.first, .table th.first { - -moz-border-radius-topleft: 4px; - -webkit-border-top-left-radius: 4px; -} - -.table th.last { - -moz-border-radius-topright: 4px; - -webkit-border-top-right-radius: 4px; -} - -.secondary-navigation ul li.first { - -moz-border-radius-topleft: 4px; - -webkit-border-top-left-radius: 4px; -} - -#sidebar, #sidebar .block, #main .block, #sidebar ul.navigation, ul.list li, #footer .block, .form input.button, #box .block { - -moz-border-radius-bottomleft: 4px; - -webkit-border-bottom-left-radius: 4px; - -moz-border-radius-bottomright: 4px; - -webkit-border-bottom-right-radius: 4px; -} - -div.block div.actions-bar { - margin: 5px; -} - -tr.notseen td.subject { - font-weight: bold; -} - -input,select,textarea { - background-color: #EFF3E4; - border: 1px solid #5E634E; - color: #black; - margin: 3px 0; -} - -#footer { - text-align: center; - color: grey; - } - -tr.unseen td { - font-weight:bold; -} - -div.actions-bar div.header_info { - float: left; - color: #5E634E; - font-size: 22px; - margin: 0 10px; - font-weight: normal; -} - -div.actions-bar div.header_info .other_info { - font-size: 12px; -} - -th a.header { - color: white; -} - -ul.navigation { - color: #A3AB74; -} - -ul.folders { - font-size: 14px; -} - -li.selected { - color: #5E634E; - font-weight: bold; -} - -div.param_group { - margin: 5px 0; - font-size: 14px; - padding: 3px 0; -} - -div.param_group label.label { - margin-right: 5px; - font-weight: bold; -} - -div.params div.group { - margin-bottom: 10px; -} - -div.msg_header label { - display: inline; - float: left; - text-align: right; - width: 100px; - margin-right: 10px; - font-weight: bold; -} - -div.msg_header div.group { - margin: 10px 0; -} - -div.msg_header { - font-size: 14px; -} - -iframe { - width: 937px; - height: 800px; - margin-top: 10px; -} - -div.params div.group div.fieldWithErrors label.label, div.params div.group label.label{ - font-weight: bold; - font-size: 14px; -} - -div.params input, div.params textarea, div.params select { - border:1px solid #CFCFCF; -} - -div.params div.group .description, div.params div.param_group .description{ - font-style: italic; - color: #8C8C8C; - font-size: 10px; -} - -.fieldWithErrors .error { - color: red; - font-size: 10px; -} - -div.attachments { - margin: 15px 0 5px; -} - -div.attachments span.title { - font-weight: bold; - font-size: 14px; -} - - - -div.render_text{ - margin: 5px 0 0 0; - font-size: 14px; -} - -div.render_text span{ - font-weight: bold; - display: block; -} - -div.render_text pre { - font-size: 12px; - background-color: #EFF3E4; - padding: 5px; - border: 1px solid #5E634E; - margin: 10px 0 0 0; - white-space: pre-wrap; /* css-3 */ - white-space: -moz-pre-wrap !important; /* Mozilla, since 1999 */ - white-space: -pre-wrap; /* Opera 4-6 */ - white-space: -o-pre-wrap; /* Opera 7 */ - word-wrap: break-word; /* Internet Explorer 5.5+ */ -} - -span.attachment { - font-size: 12px; -} - -span.attachment pre { - padding: 5px; -} - -span.attachment span.title { - font-weight: bold; -} - -div.images { - margin: 15px 0 5px; -} - -div.images span.title { - font-weight: bold; - display: block; - font-size: 14px; - margin-bottom: 5px; -} - -div.images div.image { - margin: 5px; - padding: 2px; - float: left; -} - -div.images div.image div.desc { - font-weight: normal; - font-size: 10px; - padding: 2px; -} - -div.desc span.size { - float: right; -} - -div.params input,div.params select,div.params textarea { - width: 100% -} - -.width100 { - width: 100%; -} - -table.side_calendar td { - text-align: right; - background-color: #EFF3E4; - padding: 2px; -} - -table.side_calendar td.wday, table.side_calendar td.week { - color: white; - background-color: #DACF77; - font-weight: bold; - text-align: center; -} - -table.side_calendar td.weekend { - color: white; - background-color: #5E634E; -} - -table.side_calendar td.off { - background-color: white; -} -table.side_calendar td.today { - color: white; - background-color: red; - font-weight: bold; -} - -p.version { - color: #5E634E; - text-align: center; - font-size: 14px; -} - -div.fileselect { - margin-top: 5px; - padding: 5px 0; -} - -div.actiongroup { - display: block; - margin: 5px 0; - padding: 2px 0; -} - -div.logo { - text-align: center; - margin-bottom: 10px; -} - -div#logo { - background-color: #EFF3E4; -} - -div.flash p.info { - text-align: left; - font-size: 10px; -} - -div.md { - padding: 10px; - margin-bottom: 5px; -} - -div.md ul { - margin-left:20px; -} -div.md code { - background-color: #EEEEEE; - border: 1px solid #DDDDDD; - border-radius: 3px 3px 3px 3px; - color: #444444; - font-size: 12px; - margin: 1em 0; - overflow: auto; - padding: 5px; -} diff --git a/themes/olive/views/contacts/_list.html.erb b/themes/olive/views/contacts/_list.html.erb index 55d192d..6444064 100755 --- a/themes/olive/views/contacts/_list.html.erb +++ b/themes/olive/views/contacts/_list.html.erb @@ -1,5 +1,5 @@ - + <%= t(:total_entries,:scope=>:contact) %>: <%= @contacts.total_entries %> <%= will_paginate @contacts %> @@ -19,7 +19,7 @@ <% end %> - + <%= will_paginate @contacts %> diff --git a/themes/olive/views/contacts/index.html.erb b/themes/olive/views/contacts/index.html.erb index 86b8e62..a6c5f2a 100755 --- a/themes/olive/views/contacts/index.html.erb +++ b/themes/olive/views/contacts/index.html.erb @@ -6,8 +6,8 @@ - <%= t(:contacts,:scope=>:contact) %> <% end %> - - + + <%= raw main_navigation(:contacts_tab) %> diff --git a/themes/olive/views/folders/_list.html.erb b/themes/olive/views/folders/_list.html.erb index dddbefe..5c723c6 100755 --- a/themes/olive/views/folders/_list.html.erb +++ b/themes/olive/views/folders/_list.html.erb @@ -1,6 +1,6 @@ <%=t(:folders,:scope=>:folder) %> - + <% if @folders_shown.nil? or @folders_shown.size.zero? %> <%= t(:no_shown,:scope=>:folder) %> <%= link_to t(:folders,:scope=>:folder), folders_path %> <% else %> @@ -14,7 +14,6 @@ <% end -%> <% end %> - <%= raw single_action_onclick('logout','user','power.png',user_logout_path) %> diff --git a/themes/olive/views/folders/index.html.erb b/themes/olive/views/folders/index.html.erb index cdd4b56..807a07b 100755 --- a/themes/olive/views/folders/index.html.erb +++ b/themes/olive/views/folders/index.html.erb @@ -6,13 +6,13 @@ - <%= t(:folders,:scope=>:folder) %> <% end %> - - + + <%= raw main_navigation(:folders_tab) %> - + <%= render :partial => 'create' %> <%= render :partial => 'delete' %> diff --git a/themes/olive/views/internal/about.html.erb b/themes/olive/views/internal/about.html.erb index 8ab45e3..d6562ba 100755 --- a/themes/olive/views/internal/about.html.erb +++ b/themes/olive/views/internal/about.html.erb @@ -6,25 +6,27 @@ <%= content_for_sidebar %> <% end %> - - + + <%= raw single_navigation(:about,:internal) %> - - + + <%= t(:current_version,:scope=>:internal) + ": " + $defaults["version"] %> - + <%= raw BlueCloth::new(render :file => 'README.markdown').to_html %> + <%= raw BlueCloth::new(render :file => 'CHANGES').to_html %> + <%= raw BlueCloth::new(render :file => 'TODO').to_html %> - + diff --git a/themes/olive/views/layouts/application.html.erb b/themes/olive/views/layouts/application.html.erb index b2a03ab..26f05e7 100755 --- a/themes/olive/views/layouts/application.html.erb +++ b/themes/olive/views/layouts/application.html.erb @@ -9,8 +9,7 @@ PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" - <%=stylesheet_link_tag current_theme_stylesheet_path('base') %> - <%=stylesheet_link_tag current_theme_stylesheet_path('style') %> + <%=stylesheet_link_tag current_theme_stylesheet_path('olive') %> <%=stylesheet_link_tag current_theme_stylesheet_path('calendar_olive') %> <%=stylesheet_link_tag current_theme_stylesheet_path('jquery-ui-dialog') %> <%=stylesheet_link_tag current_theme_stylesheet_path('jquery-ui-custom') %> @@ -24,7 +23,6 @@ PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" - <%= yield :sidebar %> @@ -32,8 +30,6 @@ PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" <%= render :partial=>'layouts/flash', :object => flash %> <%= yield %> - -
" #html << text.gsub!(/\r\n/,"\n") html << h(text) html << "
<%= t(:no_shown,:scope=>:folder) %> <%= link_to t(:folders,:scope=>:folder), folders_path %>