Skip to content

Commit

Permalink
* Fixed layout issues
Browse files Browse the repository at this point in the history
  • Loading branch information
ekala committed Jun 1, 2011
1 parent f7e8c49 commit 7e9bd0d
Show file tree
Hide file tree
Showing 9 changed files with 102 additions and 77 deletions.
2 changes: 1 addition & 1 deletion plugins/huduma/controllers/overlays.php
View file
Expand Up @@ -232,7 +232,7 @@ public function cluster()
// Calculate the cluster center
$bounds = cluster::calculate_cluster_center($cluster);
$cluster_center = $bounds['center'];

Kohana::log('info', sprintf('Cluster center: %s -- %d', $cluster_center, count($cluster)));
// Number of items in cluster
$cluster_count = count($cluster);
$cluster_info = cluster::get_entity_cluster_info($cluster, $bounds);
Expand Down
1 change: 1 addition & 0 deletions plugins/huduma/helpers/cluster.php
View file
Expand Up @@ -94,6 +94,7 @@ public static function get_clustered_entities($boundary_id, $zoom)
// Calculate the cluster center
$bounds = self::calculate_cluster_center($cluster);
$cluster_center = $bounds['center'];
Kohana::log('info', sprintf('Cluster center: %s', $cluster_center));

// Number of items in cluster
$cluster_count = count($cluster);
Expand Down
5 changes: 4 additions & 1 deletion plugins/huduma/views/css/huduma.css
View file
Expand Up @@ -123,6 +123,7 @@ div.report_comments_area {
.dashboard_comment_form h4, .dashboard_container h4 { font-size: 13px; padding:5px 0 0 0; margin: 8px 0 0 0; }
.dashboard_container {
float: left;
padding-left: 10px;
min-height: 40em;
width:575px;
font: 12px Arial,Helvetica,sans-serif
Expand Down Expand Up @@ -401,4 +402,6 @@ div.dash-snapshots { margin-top: -130px; }
.entity-additional-info table { border-collapse: collapse; margin-bottom: 10px; width: 100%; }
.entity-additional-info table th, .entity-additional-info table td { padding: 4px 7px !important; text-align: left; vertical-align: top; }
.entity-additional-info table th { color: #FFFFFF; }
.entity-additional-info h6{ padding: 0; margin: 0;}
.entity-additional-info h6{ padding: 0; margin: 0;}

#ui-datepicker-div { display: none !important; }
92 changes: 52 additions & 40 deletions themes/huduma/css/style.css
View file
Expand Up @@ -90,10 +90,10 @@ body#page{
}

/* wrapper setup */
div.rapidxwpr{
margin: 0 auto 0 0;
width: 100%;
div.rapidxwpr, div.rapidxwpr-main{
margin: 0 auto;
padding: 0;
width: 1100px;
}

/* header wrapper */
Expand All @@ -110,7 +110,7 @@ div#header{
/*position: relative;*/
margin: 0 auto;
/*width: 940px;*/
width: 909px;
width: 1110px;
/*height: auto;*/
overflow: hidden;
/*padding: 0 40px 0 20px;*/
Expand All @@ -119,16 +119,20 @@ div#header{
div#header-left {
float: left;
padding: 44px 0 12px 0;
width: 300px;
width: 400px;
position: relative;
right: 40px;
}

div#header-right {
float:right;
width:586px;
margin: 0;
padding: 0;
position: relative;
left: -140px;
}
div#mainpageContent { float: right; margin: 0; padding: 0; width: 586px; }
div#mainpageContent { float: right; margin: 0; padding: 0; width: 586px; position: relative; left: -140px;}

/* logo */
div#logo{
Expand Down Expand Up @@ -192,9 +196,11 @@ div#middle .layoutright div#left{
background: url(../images/content-mainbar-bg.png);
float: right;
height: 37px;
margin-right: -5px;
/*margin-right: -5px;*/
margin-top: 5px;
width: 595px;
position: relative;
left: -145px;
}

/* right column */
Expand Down Expand Up @@ -1300,17 +1306,15 @@ label.error {
font-size:16px;
}
.report_left{
float: right;
width: 400px;
/*margin:20px 0 0;*/
padding:15px 0 10px;
}
.report_left table {
width: 100%;
}
.report_left table tr th {
text-align: left;
float: left;
width: 370px;
margin: 0;
padding: 0;
}

.report_left table { width: 100%; }
.report_left table tr th { text-align: left; }

.report_right{
overflow:hidden;
width: 570px;
Expand Down Expand Up @@ -1505,7 +1509,7 @@ a.rem { background:url(../images/icon-minus.gif) no-repeat;}
font-size:14px;
font-weight:bold;
color:#666;
width:250px;
width:62.5%;
border:1px #ccc solid;
}
.report-find-loading{
Expand Down Expand Up @@ -1535,7 +1539,7 @@ a.show-more {
min-height:400px;
}

.big-block h1 {position: absolute; top: 190px; margin-left: 42%; padding: 0 0 4px 0; font-size: 120%; }
.big-block h1 {position: relative; margin-left: 42%; padding: 0 0 4px 0; font-size: 120%; }

/* Min-Height for IE */
* html .big-block {
Expand Down Expand Up @@ -1670,16 +1674,19 @@ a.show-more {

/*---alerts-block---*/
.step-1 {
float: right;
width: 420px;
margin: 11px 0 0 0;
/*float: right;*/
width: 370px;
padding: 0;
margin: 0;
/*position: relative;*/
/*right: 80px;*/
}
.step-1 h2 {
.step-1 h2, .step-2 h2 {
text-align: right;
margin:0;
padding:0 0 0 10px;
}
.step-2 h2 { text-align: left !important; }
.step-1 .location {
overflow:hidden;
width:388px;
Expand All @@ -1693,7 +1700,7 @@ a.show-more {
}
.step-1 .map {
overflow:hidden;
width: auto;
width: 350px;
padding: 10px;
margin: 20px 0 0 0;
height: 366px;
Expand All @@ -1706,7 +1713,7 @@ a.show-more {
}
.step-1 .map .map-holder {
overflow:hidden;
width:387px;
width:350px;
height:325px;
}
.step-1 .alert_slider{
Expand All @@ -1719,23 +1726,22 @@ a.show-more {
}
.step-2-holder {
float: left;
display: inline;
overflow: hidden;
/*width:450px;*/
display: inline;
overflow: hidden;
}
.step-2,
.step-3 {

.step-2, .step-3 {
overflow:hidden;
width:430px;
margin:10px 0 0;
margin:0 0 10px 0;
padding:0 0 10px;
}
.feed {
overflow:hidden;
width:400px;
margin:50px 0 0;
overflow: hidden;
width: 400px;
margin: 0;
padding: 15px;
border: 1px solid #c2c2c2;
border: 1px solid #c2c2c2;
}

.feed .holder .box {
Expand Down Expand Up @@ -2120,11 +2126,17 @@ div.green-box ul, div.red-box ul{
padding: 5px 10px 0 0;
}

div#pageColLeft{ float: left; width: 38%; margin: 0; padding: 0; }
div#pageColRight { float:right; width: 59.1%; }
.mainpage-left { float: right; width: 300px; padding: 0px; }
div#pageColLeft{ float: left; /*position: relative !important;*/ /*right: 40px;*/ width: 400px; margin: 0 0; padding: 0 80px 12px 0; }
div#pageColRight { float: right; width: 586px; padding: 0; margin: 0; position: relative; left: -140px; }

.mainpage-left { float: right; width: 310px; padding: 0 30px 0 0; position: relative; right: 20px; }
.mainpage-middle { float: left; width: 587px; }

.report_left .report_row h4 { text-align: right; font-size: 110%; padding-right: 23px; }
div.contact { width: 535px; margin: 20px 0; background-color: #fff; border: none; }

div.contact { width: 535px; margin: 0; padding: 0 15px; background-color: #fff; border: none; }
div.contact input { width: 300px; height: 20px; }
div.contact input.btn_submit { width: auto; height: auto; }
div.contact input.btn_submit { width: auto; height: auto; }

.page-title { position: relative; float: right; top: -22px; width: 587px; left: -140px; padding: 0; margin: 0;}
.page-title h1 { font-size: 130%; padding: 0 15px; margin: 0; }
23 changes: 13 additions & 10 deletions themes/huduma/views/alerts.php
View file
@@ -1,11 +1,10 @@
<div id="content">
<div class="content-bg">
<div class="page-title"><h1><?php echo Kohana::lang('ui_main.alerts_get'); ?></h1></div>
<div style="clear:both;"></div>
<!-- start block -->
<div class="big-block">
<h1><?php echo Kohana::lang('ui_main.alerts_get'); ?></h1>
<?php
if ($form_error) {
?>
<?php if ($form_error): ?>
<!-- red-box -->
<div class="red-box">
<h3>Error!</h3>
Expand All @@ -19,9 +18,7 @@
?>
</ul>
</div>
<?php
}
?>
<?php endif; ?>
<?php print form::open() ?>
<input type="hidden" id="alert_lat" name="alert_lat" value="<?php echo $form['alert_lat']; ?>">
<input type="hidden" id="alert_lon" name="alert_lon" value="<?php echo $form['alert_lon']; ?>">
Expand Down Expand Up @@ -101,9 +98,15 @@
</div>
</div>
</div>
<input id="btn-send-alerts" class="btn_submit" type="submit" value="<?php echo Kohana::lang('ui_main.alerts_btn_send'); ?>" />
<BR /><BR />
<a href="<?php echo url::site()."alerts/confirm";?>"><?php echo Kohana::lang('ui_main.alert_confirm_previous'); ?></a>
<div class="step-3">
<div class="holder">
<div class="box">
<input id="btn-send-alerts" class="btn_submit" type="submit" value="<?php echo Kohana::lang('ui_main.alerts_btn_send'); ?>" />
<BR /><BR />
<a href="<?php echo url::site()."alerts/confirm";?>"><?php echo Kohana::lang('ui_main.alert_confirm_previous'); ?></a>
</div>
</div>
</div>
</div>

<?php if ($allow_feed == 1 ): ?>
Expand Down
24 changes: 8 additions & 16 deletions themes/huduma/views/contact.php
View file
@@ -1,17 +1,15 @@
<div id="content">
<div class="content-bg">
<div class="page-title"><h1><?php echo Kohana::lang('ui_main.contact'); ?></h1></div>
<div style="clear:both;"></div>

<!-- start contacts block -->
<div class="big-block">
<h1><?php echo Kohana::lang('ui_main.contact'); ?></h1>

<div id="pageColLeft"></div>

<div id="pageColRight">
<div id="contact_us" class="contact">
<?php
if ($form_error)
{
?>
<div id="contact_us" class="contact">
<?php if ($form_error): ?>
<!-- red-box -->
<div class="red-box">
<h3>Error!</h3>
Expand All @@ -24,19 +22,13 @@
?>
</ul>
</div>
<?php
}

if ($form_sent)
{
?>
<?php endif; ?>
<?php if ($form_sent): ?>
<!-- green-box -->
<div class="green-box">
<h3><?php echo Kohana::lang('ui_main.contact_message_has_send'); ?></h3>
</div>
<?php
}
?>
<?php endif; ?>
<?php print form::open(NULL, array('id' => 'contactForm', 'name' => 'contactForm')); ?>
<div class="report_row">
<strong><?php echo Kohana::lang('ui_main.contact_name'); ?>:</strong><br />
Expand Down
2 changes: 1 addition & 1 deletion themes/huduma/views/header_main.php
View file
Expand Up @@ -195,7 +195,7 @@
<!-- /header wrapper-->

<!-- wrapper -->
<div class="rapidxwpr floatholder">
<div class="rapidxwpr-main floatholder">

<!-- main body -->
<div id="middle">
Expand Down
16 changes: 16 additions & 0 deletions themes/huduma/views/page.php
View file
@@ -0,0 +1,16 @@
<div id="content">
<div class="content-bg">
<div class="page-title"><h1><?php echo $page_title ?></h1></div>
<div style="clear: both;"></div>
<div class="big-block">
<div id="pageColLeft"></div>
<div id="pageColRight">
<div class="page_text">
<?php echo htmlspecialchars_decode($page_description); ?>
<?php Event::run('ushahidi_action.page_extra', $page_id); ?>
</div>
</div>
<div style="clear: both"></div>
</div>
</div>
</div>
14 changes: 6 additions & 8 deletions themes/huduma/views/reports_submit.php
View file
@@ -1,15 +1,14 @@
<div id="content">
<div class="bg">
<div class="content-bg">
<div class="page-title"><h1><?php echo Kohana::lang('ui_main.reports_submit_new'); ?></h1></div>
<div style="clear:both;"></div>
<!-- start report form block -->
<?php print form::open(NULL, array('enctype' => 'multipart/form-data', 'id' => 'reportForm', 'name' => 'reportForm', 'class' => 'gen_forms')); ?>
<input type="hidden" name="latitude" id="latitude" value="<?php echo $form['latitude']; ?>">
<input type="hidden" name="longitude" id="longitude" value="<?php echo $form['longitude']; ?>">
<input type="hidden" name="form_id" id="form_id" value="<?php echo $id?>">
<div class="big-block">
<h1><?php echo Kohana::lang('ui_main.reports_submit_new'); ?></h1>
<?php
if ($form_error) {
?>
<?php if ($form_error): ?>
<!-- red-box -->
<div class="red-box">
<h3>Error!</h3>
Expand All @@ -23,9 +22,7 @@
?>
</ul>
</div>
<?php
}
?>
<?php endif; ?>

<div id="pageColLeft">
<div class="report_left">
Expand Down Expand Up @@ -325,3 +322,4 @@
<!-- end report form block -->
</div>
</div>
</div>

0 comments on commit 7e9bd0d

Please sign in to comment.