Skip to content

Commit

Permalink
resolve #18
Browse files Browse the repository at this point in the history
  • Loading branch information
@osk2
osk2 committed Oct 18, 2015
1 parent 96fda88 commit 17a838f
Show file tree
Hide file tree
Showing 4 changed files with 120 additions and 54 deletions.
52 changes: 31 additions & 21 deletions View/Areas/index.ctp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -71,30 +71,40 @@ if (!empty($parents)) {
++$candidateCount;
?>
<div class="col-md-2 col-xs-6">
<div class="thumbnail candidate-<?php echo $candidate['Candidate']['stage']; ?>">
<div class="candidate-image-wrapper">
<a href="<?php echo $this->Html->url('/candidates/view/' . $candidate['Candidate']['id']); ?>">
<div class="candidates-box">
<?php
if (intval($candidate['Candidate']['stage']) === 2) {
echo '<span class="ribbon">當選</span>';
}
?>
<div class="thumbnail">
<div class="candidate-image-wrapper">
<a href="<?php echo $this->Html->url('/candidates/view/' . $candidate['Candidate']['id']); ?>">
<?php
if (empty($candidate['Candidate']['image'])) {
echo $this->Html->image('candidate-not-found.jpg', array('class' => 'candidate-image'));
} else {
echo $this->Html->image('../media/' . $candidate['Candidate']['image'], array('class' => 'candidate-image'));
}
?>
</a>
</div>
<div class="caption">
<?php
if (empty($candidate['Candidate']['image'])) {
echo $this->Html->image('candidate-not-found.jpg', array('class' => 'candidate-image'));
} else {
echo $this->Html->image('../media/' . $candidate['Candidate']['image'], array('class' => 'candidate-image'));
echo $this->Html->link(
$this->Html->tag('h3', $candidate['Candidate']['name']),
'/candidates/view/' . $candidate['Candidate']['id'],
array('escape' => false)
);
echo $this->Html->para(null, $candidate['Candidate']['party']);
if(!empty($candidate['Candidate']['no'])) {
echo $this->Html->para(null, $candidate['Candidate']['no'] . '號');
}
if (intval($candidate['Candidate']['stage']) === 0) {
echo '<p>未登記</p>';
}
?>
</a>
</div>
<div class="caption">
<?php
echo $this->Html->link(
$this->Html->tag('h3', $candidate['Candidate']['name']),
'/candidates/view/' . $candidate['Candidate']['id'],
array('escape' => false)
);
echo $this->Html->para(null, $candidate['Candidate']['party']);
if(!empty($candidate['Candidate']['no'])) {
echo $this->Html->para(null, $candidate['Candidate']['no'] . '號');
}
?>
</div>
</div>
</div>
</div>
Expand Down
52 changes: 31 additions & 21 deletions View/Candidates/index.ctp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -63,30 +63,40 @@
foreach ($items AS $candidate) {
++$candidateCount;
?><div class="col-md-2 col-sm-6 col-xs-6">
<div class="thumbnail candidate-<?php echo $candidate['Candidate']['stage']; ?>">
<div class="candidate-image-wrapper">
<a href="<?php echo $this->Html->url('/candidates/view/' . $candidate['Candidate']['id']); ?>">
<div class="candidates-box">
<?php
if (intval($candidate['Candidate']['stage']) === 2) {
echo '<span class="ribbon">當選</span>';
}
?>
<div class="thumbnail">
<div class="candidate-image-wrapper">
<a href="<?php echo $this->Html->url('/candidates/view/' . $candidate['Candidate']['id']); ?>">
<?php
if (empty($candidate['Candidate']['image'])) {
echo $this->Html->image('candidate-not-found.jpg', array('class' => 'candidate-image'));
} else {
echo $this->Html->image('../media/' . $candidate['Candidate']['image'], array('class' => 'candidate-image'));
}
?>
</a>
</div>
<div class="caption">
<?php
if (empty($candidate['Candidate']['image'])) {
echo $this->Html->image('candidate-not-found.jpg', array('class' => 'candidate-image'));
} else {
echo $this->Html->image('../media/' . $candidate['Candidate']['image'], array('class' => 'candidate-image'));
echo $this->Html->link(
$this->Html->tag('h3', $candidate['Candidate']['name']),
'/candidates/view/' . $candidate['Candidate']['id'],
array('escape' => false)
);
echo $this->Html->para(null, $candidate['Candidate']['party']);
if(!empty($candidate['Candidate']['no'])) {
echo $this->Html->para(null, $candidate['Candidate']['no'] . '號');
}
if (intval($candidate['Candidate']['stage']) === 0) {
echo '<p>未登記</p>';
}
?>
</a>
</div>
<div class="caption">
<?php
echo $this->Html->link(
$this->Html->tag('h3', $candidate['Candidate']['name']),
'/candidates/view/' . $candidate['Candidate']['id'],
array('escape' => false)
);
echo $this->Html->para(null, $candidate['Candidate']['party']);
if(!empty($candidate['Candidate']['no'])) {
echo $this->Html->para(null, $candidate['Candidate']['no'] . '號');
}
?>
</div>
</div>
</div>
</div><?php
Expand Down
42 changes: 30 additions & 12 deletions View/Candidates/tag.ctp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,21 +15,39 @@
foreach ($items AS $candidate) {
++$candidateCount;
?><div class="col-md-2 col-sm-4 col-xs-6">
<a class="thumbnail text-center candidate-<?php echo $candidate['Candidate']['stage']; ?>" href="<?php echo $this->Html->url('/candidates/view/' . $candidate['Candidate']['id']); ?>">
<div class="candidates-box">
<?php
if (empty($candidate['Candidate']['image'])) {
echo $this->Html->image('candidate-not-found.jpg', array('style' => 'width: 100px; border: 0px;'));
} else {
echo $this->Html->image('../media/' . $candidate['Candidate']['image'], array('style' => 'width: 100px; height: 100px; border: 0px;'));
if (intval($candidate['Candidate']['stage']) === 2) {
echo '<span class="ribbon">當選</span>';
}
?>
<br><?php
if(!empty($candidate['Candidate']['no'])) {
echo $candidate['Candidate']['no'] . '號 ';
}
echo $candidate['Candidate']['name']; ?>
<br><?php echo $candidate['Election'][1]['Election']['name']; ?>
</a>
<div class="thumbnail text-center">
<a href="<?php echo $this->Html->url('/candidates/view/' . $candidate['Candidate']['id']); ?>">
<?php
if (empty($candidate['Candidate']['image'])) {
echo $this->Html->image('candidate-not-found.jpg', array('style' => 'width: 100px; border: 0px;'));
} else {
echo $this->Html->image('../media/' . $candidate['Candidate']['image'], array('style' => 'width: 100px; height: 100px; border: 0px;'));
}
?>
</a>
<?php
echo $this->Html->link(
$this->Html->tag('h3', $candidate['Candidate']['name']),
'/candidates/view/' . $candidate['Candidate']['id'],
array('escape' => false)
);
echo $candidate['Election'][1]['Election']['name'];
echo '<br>';
if(!empty($candidate['Candidate']['no'])) {
echo $candidate['Candidate']['no'] . '號 ';
}
if (intval($candidate['Candidate']['stage']) === 0) {
echo '<br>未登記';
}
?>
</div>
</div>
</div><?php
if ($candidateCount >= 6) {
echo '<div class="clearfix"></div>';
Expand Down
28 changes: 28 additions & 0 deletions webroot/css/default.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -303,4 +303,32 @@ hr {
.label-list {
width: 90%;
word-break: break-word;
}

.ribbon {
position: absolute;
top: -30px;
left: -75px;
width: 150px;
height: 30px;
background-color: #e95b4c;
color: #fff;
font-size: 20px;
text-align: center;
line-height: 25px;
transform: rotate(-45deg);
-o-transform: rotate(-45deg);
-ms-transform: rotate(-45deg);
-moz-transform: rotate(-45deg);
-webkit-transform: rotate(-45deg);
transform-origin: 100% 0%;
-o-transform-origin: 100% 0%;
-ms-transform-origin: 100% 0%;
-moz-transform-origin: 100% 0%;
-webkit-transform-origin: 100% 0%;
}

.candidates-box {
position: relative;
overflow: hidden;
}

0 comments on commit 17a838f

Please sign in to comment.