Skip to content

Commit

Permalink
Merge branch 'stagingmerge' of ssh://pps/home/rmarianski/git/udw
Browse files Browse the repository at this point in the history
  • Loading branch information
@rmarianski
rmarianski committed May 15, 2011
2 parents 4e12023 + 95ed84b commit 2323834
Show file tree
Hide file tree
Showing 12 changed files with 1,689 additions and 1,612 deletions.
2,920 changes: 1,460 additions & 1,460 deletions application/controllers/reports.php
View file

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions application/helpers/nav.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,9 +22,9 @@ public static function main_tabs($this_page = FALSE)
// Reports Submit
if (Kohana::config('settings.allow_reports'))
{
$menu .= "<li><h1><a href=\"".url::site()."reports/submit\" ";
$menu .= "<li><a href=\"".url::site()."reports/submit\" ";
$menu .= ($this_page == 'reports_submit') ? " class=\"active\"":"";
$menu .= ">".Kohana::lang('ui_main.submit')."</a></h1></li>";
$menu .= ">".Kohana::lang('ui_main.submit')."</a></li>";
}


Expand Down
2 changes: 1 addition & 1 deletion application/i18n/en_US/ui_main.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
'active' => 'Active',
'add' => 'Add',
'added_by' => 'Added By',
'additional_reports' => 'Additional Ideas',
'additional_reports' => 'Nearby Ideas',
'add_edit' => 'Add/Edit',
'add_field' => 'Add a Field',
'add_language' => 'Add Language',
Expand Down
Binary file modified media/img/down.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified media/img/gray_down.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified media/img/gray_up.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified media/img/up.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
134 changes: 94 additions & 40 deletions themes/pps/css/style.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,12 +23,12 @@ body{

/* links */
a{
color: #f60;
color: #fff;
text-decoration: none;
}

a:hover{
color: #f60;
color: #fff;
text-decoration: underline;
}

Expand Down Expand Up @@ -62,6 +62,7 @@ h4{
font-size: 175%;

font-family: Helvetica, arial, serif;
margin-bottom: .2em;
}

h5{
Expand All @@ -74,7 +75,7 @@ h5{
h6{
font-size: 140%;

margin-bottom: 45px;
margin-bottom: 30px;
font-weight: normal;
}

Expand All @@ -87,7 +88,7 @@ body{

body#page{

background: #C3DCF2 url(../images/page-bg.png) fixed no-repeat center top;
background: #ff9600 url(../images/page-bg.png) fixed no-repeat center top;

}

Expand Down Expand Up @@ -412,20 +413,26 @@ div#mainmenu li{
}

div#mainmenu a{
display: block;
display: block;
position: relative;
padding: 7px 12px;
color: #f60;
color: #fff;
overflow: hidden;
border: 2px #fff solid;
text-transform: uppercase;
font-weight: bold;
font-size: 120%;
background:none;
font-size: 135%;
-moz-border-radius:4px;
-khtml-border-radius:4px;
-webkit-border-radius:4px;
border-radius:4px;
}

div#mainmenu a:hover{
text-decoration: none;
color: #fff;
background: #f60;
color: #f60;
background: #fff;
-moz-border-radius:4px;
-khtml-border-radius:4px;
-webkit-border-radius:4px;
Expand All @@ -440,8 +447,8 @@ div#mainmenu a.active{
text-transform: uppercase;
font-weight: bold;
text-decoration: none;
color: #fff;
background: #f60;
color: #f60;
background: #fff;
-moz-border-radius:4px;
-khtml-border-radius:4px;
-webkit-border-radius:4px;
Expand Down Expand Up @@ -580,10 +587,10 @@ div.cat-filters span a{
}

ul.category-filters{
filter:alpha(opacity=75);
/*filter:alpha(opacity=75);
-moz-opacity:0.75;
-khtml-opacity: 0.75;
opacity: 0.75;
opacity: 0.75;*/
background: #fff;
border-top: #ccc 0px solid;
border-bottom: #ccc 0px solid;
Expand Down Expand Up @@ -738,27 +745,28 @@ div.report-details{
.report_detail .r_unverified { background:#A60003; }

.report_detail .r_location { background:transparent url(../images/icon_sprite.png) -5px -163px no-repeat; }
.report_detail .r_date { background:transparent url(../images/icon_sprite.png) -4px -133px no-repeat; }
.report_detail .r_date { background:transparent url(../images/icon_sprite.png) -4px -133px no-repeat; padding: 3px 0px 3px 21px;}

.report-when-where { color:#908B88; margin-bottom:10px; }
.report-when-where span { padding:3px 5px 3px 18px; }
.report-when-where { color:#000; margin-bottom:25px; }
.report-when-where span { padding: 3px 35px 3px 0px; }

div.report-category-list {
border-top:1px dotted #C0C2B8;
border-bottom:1px dotted #C0C2B8;
border-top:1px solid #f60;
border-bottom:0px solid #f60;
padding:10px 0px 10px 0px;
margin: 0px 20px 10px 0px;
overflow:auto;
}

div.report-category-list a { font-size:11px; padding:1px 5px; margin:0px 5px 5px 0; background: transparent; display:inline-block; float:left; line-height:18px; color: #f60; }
div.report-category-list a:hover { text-decoration:none; color:#f60; }
div.report-category-list a { font-size:11px; padding:1px 3px; margin:0px 5px 5px 0; background: transparent; display:inline-block; float:left; line-height:18px; color: #f60; }
div.report-category-list a:hover { text-decoration:underline; color:#f60; }

div.report-category-list a span.r_cat-box { height:16px; width:16px; display:inline-block; margin:3px 3px 3px 0; }

div.report-description-text {
/* border-bottom:1px dotted #C0C2B8; */
padding:10px 0;
margin-bottom:18px;
margin-bottom:0px;
}

div.report-description-text h5 {
Expand All @@ -771,15 +779,15 @@ div.report-description-text h5 {
div.credibility {
margin-top:10px;
padding:3px;
border-top:1px dotted #C0C2B8;
border-top:0px dotted #C0C2B8;
}

div.report-title {
padding-bottom:0px;
}

div.report-comments {
border-bottom:#000000 dotted 1px;
border-bottom:#000000 solid 0px;
padding:5px 0px 5px 0px;
}

Expand All @@ -793,11 +801,25 @@ div.report-comments h5 {
div.report-comment-box {
margin-bottom:15px;
padding:5px 0 0 10px;
border-top: 1px #000 solid;
font-size: 14px;

}



div.comment-block {
padding:5px 0px 5px 0px; background:#F2F2F2;
float:left;
width:510px;
padding:10px 0px 5px 10px;

background: #fff;

-moz-border-radius:8px;
-khtml-border-radius:8px;
-webkit-border-radius:8px;
border-radius:8px;

}

div.comment-block h5 {
Expand Down Expand Up @@ -875,7 +897,7 @@ ul.map-toggles li a:active { display:inline-block; padding:3px 5px 3px 17px; out

div.report-additional-reports {
padding-top: 5px;
border-bottom:1px dotted #C0C2B8;
border-bottom:0px dotted #C0C2B8;
}
div.report-additional-reports .rb_report { }
div.report-additional-reports h4,
Expand All @@ -887,19 +909,24 @@ div.report-news h4 {
}

div.report-news ul {
list-style: none;
list-style: ;
margin-top: 0.25em 0 0 0;
}
div.report-news li {
margin: 0.25em 0;
}
div.report-news a {
font-weight: bold;
color:#f60;
}
div.report-news a:hover {
font-weight: bold;
color:#f60;
}

div.report-additional-reports h5 { font-size:12px; margin:4px 120px 2px 0; }
div.report-additional-reports .r_date { font-size:10px; background:transparent url(../images/icon_sprite.png) 0px -133px no-repeat; }
div.report-additional-reports .r_location { font-size:10px; padding:3px 0 3px 18px; color:#828784; }
div.report-additional-reports .r_location { font-size:10px; padding:3px 0 3px 18px; color:#000; }

div.report-details ul.details{
list-style: none;
Expand Down Expand Up @@ -1390,10 +1417,10 @@ label.error {
margin:20px 20px 20px 0px;

padding: 20px 0px 0px 20px;
filter:alpha(opacity=75);
/* filter:alpha(opacity=75);
-moz-opacity:0.75;
-khtml-opacity: 0.75;
opacity: 0.75;
opacity: 0.75;*/
background: #fff;

-moz-border-radius:8px;
Expand All @@ -1409,6 +1436,33 @@ label.error {
/*filter: progid:DXImageTransform.Microsoft.Shadow(Strength=4, Direction=135, Color='#cccccc');
border: 1px #ccc solid;*/
}

.view_left{
float:left;
width:500px;
margin:7px 20px 20px 0px;

padding: 20px 0px 0px 20px;
/* filter:alpha(opacity=75);
-moz-opacity:0.75;
-khtml-opacity: 0.75;
opacity: 0.75;*/
background: #fff;

-moz-border-radius:8px;
-khtml-border-radius:8px;
-webkit-border-radius:8px;
border-radius:8px;
/* -moz-box-shadow: 3px 3px 4px #ccc;
-webkit-box-shadow: 3px 3px 4px #ccc;
box-shadow: 3px 3px 4px #ccc;*/
/* For IE 8 */
/*-ms-filter: "progid:DXImageTransform.Microsoft.Shadow(Strength=4, Direction=135, Color='#cccccc')";*/
/* For IE 5.5 - 7 */
/*filter: progid:DXImageTransform.Microsoft.Shadow(Strength=4, Direction=135, Color='#cccccc');
border: 1px #ccc solid;*/
}

.report_left table {
width: 100%;
}
Expand All @@ -1420,10 +1474,10 @@ label.error {
width:180px;
margin:20px;
padding: 20px 20px 20px 20px;
filter:alpha(opacity=75);
/*filter:alpha(opacity=75);
-moz-opacity:0.75;
-khtml-opacity: 0.75;
opacity: 0.75;
opacity: 0.75;*/
background: #fff;
-moz-border-radius:8px;
-khtml-border-radius:8px;
Expand Down Expand Up @@ -1764,7 +1818,7 @@ a.show-more {
/* Reports View */
.reports-box { margin-top: 1em; }

.rb_report { position:relative; border-top:1px solid #333; overflow:auto; padding-bottom:10px; }
.rb_report { position:relative; border-top:1px solid #f60; overflow:auto; padding-bottom:10px; padding-top:10px; margin: 0px 20px 10px 0px; }
.reports-box .hover { background: none; }
.r_media { float:left; width:100px; margin:15px 15px 15px 0; }
.r_photo a { display:inline-block; padding: 2px; border:1px solid #c0c2b8;}
Expand All @@ -1783,8 +1837,8 @@ a.show-more {

.r_details { float:left; width:782px; margin:15px 0; }
.r_details h3 { font-size:14px; margin-bottom:0px; width:670px; }
.r_details h3 a.r_title { font-size:14px; color:#f60; }
.hover .r_details h3 a.r_title { color:#f60; }
.r_details h3 a.r_title { font-size:14px; color:#fff; }
.hover .r_details h3 a.r_title { color:#fff; }
.r_details h3 a.r_comments { color:#fff; font-size:11px; display:inline-block; text-align:center; height:19px; width:24px; padding:4px 0 3px; background:transparent url(../images/icon_sprite.png) 0 0 no-repeat; }
.r_details h3 a.r_comments:hover { }
/*verified/unverified*/
Expand All @@ -1793,11 +1847,11 @@ a.show-more {
.r_details h3 span.r_verified { background:#368C00; }
.r_details h3 span.r_unverified { background:#A60003; }

p.r_date { position:absolute; top:0px; right:0px; padding:3px 5px 4px 23px; background: transparent url(../images/icon_sprite.png) 0px -133px no-repeat; color:#908b88; }
p.r_date { position:absolute; top:0px; right:0px; padding:3px 5px 4px 23px; background: transparent url(../images/icon_sprite.png) 0px -133px no-repeat; color:#000; }

div.r_description { margin-bottom:5px; }

p.r_location a { color:#828784; font-size:11px; line-height:11px; padding:4px 0 6px 18px; background:transparent url(../images/icon_sprite.png) -6px -163px no-repeat; }
p.r_location a { color:#000; font-size:11px; line-height:11px; padding:4px 0 6px 18px; background:transparent url(../images/icon_sprite.png) -6px -163px no-repeat; }


/*---alerts-block---*/
Expand Down Expand Up @@ -2202,10 +2256,10 @@ div.green-box {
border:0px solid #a7d1a7;
clear:both;
overflow:hidden;
filter:alpha(opacity=75);
/*filter:alpha(opacity=75);
-moz-opacity:0.75;
-khtml-opacity: 0.75;
opacity: 0.75;
opacity: 0.75;*/
background: #fff;
-moz-border-radius:8px;
-khtml-border-radius:8px;
Expand Down Expand Up @@ -2301,10 +2355,10 @@ width: 200px;
.filter-block {
overflow: hidden;
padding: 10px;
filter: alpha(opacity=75);
/*filter: alpha(opacity=75);
-moz-opacity: 0.75;
-khtml-opacity: 0.75;
opacity: 0.75;
opacity: 0.75;*/
background: white;
-moz-border-radius: 8px;
-khtml-border-radius: 8px;
Expand Down
Binary file modified themes/pps/images/page-bg.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading

0 comments on commit 2323834

Please sign in to comment.