Mirrors/Sequenzia
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'testing' into 'master'

Browse Source 
# Conflicts:
#   app/views/post/show_partials/_statistics_panel.php
This commit is contained in:
Yukimi Kazari 2017-01-25 06:31:37 -05:00
commit 04c65079d2
2 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
app/views/post/show_partials/_statistics_panel.php
View File

@ -1,9 +1,12 @@
<div id="stats" class="vote-container">
<ul>
<?php if ($this->post->user->has_avatar()) : ?>
<li><?= $this->avatar($this->post->user, 1) ?></li>
<li><?= $this->t('.id') ?>: <?= $this->post->id ?></li>
<?php if ($this->post->image()) : ?>
<div style="width: 25em; height: <?= max($this->user->avatar_height, 80) ?>px; position: relative;">
<div style="position: absolute; bottom: 0;">
<?= $this->avatar($this->user, 1) ?>
</div>
<?php endif ?>
<li><?= $this->t('.id') ?>: <?= $this->post->id ?></li>
<li><?= $this->t('.posted') ?>: <?= $this->t(['.posted_data_html', 'time' => $this->linkTo($this->t(['time.x_ago', 't' => $this->timeAgoInWords($this->post->created_at)]), ["#index", 'tags' => "date:" . substr($this->post->created_at, 0, 10)], ['title' => substr(date('r', strtotime($this->post->created_at)), 0, -6)]), 'user' => $this->linkToIf($this->post->user_id, $this->post->author(), ['user#show', 'id' => $this->post->user_id])]) ?></li>
<?php if (current_user()->is_admin() && $this->post->approver) : ?>
<li><?= $this->t('.approver') ?>: <?= $this->post->approver->name ?></li>
@ -41,4 +44,3 @@
Post.init_add_to_favs(<?= $this->post->id ?>, $("add-to-favs"), $("remove-from-favs"));
</script>
<?php }) ?>

4
public/assets/application-0b1f0761b0f488c409a80b516518e0e1.css
View File

@ -649,7 +649,7 @@ div#post-view>div#right-col>div>div#note-container>div.note-box{background:#FFE;
div#post-view>div#right-col>div>div#note-container>div.note-box>div.note-corner{background:black;bottom:0;cursor:se-resize;height:7px;position:absolute;right:0;width:7px}
div#post-view>div#right-col>div>div#note-container>div.unsaved{background:#FFF;border:1px solid red}
div#post-view>div#right-col>div>div#note-container>div.unsaved>div.note-corner{background:red}
div#post-view>div#right-col>div>img{margin-right:5em}
div#post-view>div#right-col>div>img{margin-right:5em;border:1px solid rgba(109, 0, 0, 0.54);}
div#post-view>div#right-col>div#edit{margin-bottom:2em;padding:1em}
div.quote>a{color:#581a21}
div#related{margin:0 3em 1em 0}
@ -671,7 +671,7 @@ div#static-index>div#links>a{margin:0 .5em}
div#static-more>div{float:left;width:25%}
div#static-more>div>ul{margin-top:2em}
div#static-more>div>ul>li{list-style-type:none;margin:0}
div.status-notice{background:black;border:2px solid #BF5050;margin:0 0 .5em;padding:.5em}
div.status-notice{background:black;border:2px solid #BF5050;margin:0 0 .5em;padding:5px 10px 5px 10px}
div.status-notice p{margin:0}
div#tag-list{margin-bottom:2em;text-align:center}
div#tag-list>a{padding-right:5px}