Skip to content

opSkinThemePluginの更新に伴い、テーマの変更がタイムラインにも反映されるように変更 #25

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
nishizoe wants to merge 2 commits into
base: master
Choose a base branch
from
Open

opSkinThemePluginの更新に伴い、テーマの変更がタイムラインにも反映されるように変更 #25

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
fbdb97c
opSkinThemePluginの更新に伴い、テーマの変更がタイムラインにも反映されるように変更
Jul 5, 2013
de41efe
opSkinThemePluginの更新に伴い、テーマの変更がタイムラインにも反映されるように変更
Jul 5, 2013
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 4 additions & 6 deletions apps/pc_frontend/modules/timeline/templates/_timelineAll.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,14 +25,12 @@
<?php use_javascript('/opTimelinePlugin/js/jquery.timeago.js', 'last') ?>
<?php use_javascript('/opTimelinePlugin/js/lightbox.js', 'last') ?>
<?php use_stylesheet('/opTimelinePlugin/css/lightbox.css', 'last') ?>
<?php use_stylesheet('/opTimelinePlugin/css/bootstrap.css', 'last') ?>
<?php use_stylesheet('/opTimelinePlugin/css/timeline.css', 'last') ?>
<?php use_stylesheet('/opTimelinePlugin/css/counter.css', 'last') ?>

<script type="text/javascript">
$(function(){
$("#timeline-textarea").focus(function(){
$('.timeline-postform').css('padding-bottom', '30px');
$('.timeline-postform').css('padding-bottom', '50px');
$('#timeline-textarea').attr('rows', '3');
$('#timeline-submit-area').css('display', 'inline');

Expand Down Expand Up @@ -62,22 +60,22 @@
<div class="partsHeading"><h3>SNSメンバー全員の<?php echo $op_term['activity'] ?></h3></div>

<div class="timeline">
<div class="timeline-postform well">
<div class="timeline-postform">
<textarea id="timeline-textarea" class="input-xlarge" rows="1" placeholder="今何してる？" tabindex="1" onkeypress="return (this.value.length < 1139)"></textarea>
<div id="timeline-submit-loader"><?php echo op_image_tag('ajax-loader.gif', array()) ?></div>
<div id="timeline-submit-error"></div>
<div id="timeline-upload-error"></div>
<div id="timeline-submit-area">
<span id="timeline-upload-photo-button" class="btn"><i class="icon-camera"></i></span>
<span id="photo-remove"><span class="icon-remove"></span></span><span id="photo-file-name"></span>
<input id="timeline-submit-upload" type="file" name="timeline-submit-upload" enctype="multipart/form-data">
<button id="timeline-submit-button" class="btn btn-primary timeline-submit" tabindex="2" disabled="disabled">投稿</button>
<span id="counter"></span>
<select id="timeline-public-flag">
<?php foreach ($publicFlags as $value => $text): ?>
<option value="<?php echo $value ?>"><?php echo __($text) ?></option>
<?php endforeach; ?>
</select>
<input id="timeline-submit-upload" type="file" name="timeline-submit-upload" enctype="multipart/form-data">
<button id="timeline-submit-button" class="btn btn-primary timeline-submit" tabindex="2" disabled="disabled">投稿</button>
</div>
</div>

Expand Down
10 changes: 4 additions & 6 deletions apps/pc_frontend/modules/timeline/templates/_timelineCommunity.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,14 +38,12 @@
<?php use_javascript('/opTimelinePlugin/js/jquery.timeago.js', 'last') ?>
<?php use_javascript('/opTimelinePlugin/js/lightbox.js', 'last') ?>
<?php use_stylesheet('/opTimelinePlugin/css/lightbox.css', 'last') ?>
<?php use_stylesheet('/opTimelinePlugin/css/counter.css', 'last') ?>
<?php use_stylesheet('/opTimelinePlugin/css/bootstrap.css', 'last') ?>
<?php use_stylesheet('/opTimelinePlugin/css/timeline.css', 'last') ?>

<script type="text/javascript">
$(function(){
$("#timeline-textarea").focus(function(){
$('.timeline-postform').css('padding-bottom', '30px');
$('.timeline-postform').css('padding-bottom', '50px');
$('#timeline-textarea').attr('rows', '3');
$('#timeline-submit-area').css('display', 'inline');

Expand All @@ -72,24 +70,24 @@
<?php include_partial('timeline/timelineTemplate') ?>
<div class="partsHeading"><h3><?php echo $community->getName() ?><?php echo $op_term['activity'] ?></h3></div>
<div class="timeline">
<div class="timeline-postform well">
<div class="timeline-postform">
<textarea id="timeline-textarea" class="input-xlarge" rows="1" tabindex="1" placeholder="今何してる？"></textarea>
<div id="timeline-submit-loader"><?php echo op_image_tag('ajax-loader.gif', array()) ?></div>
<div id="timeline-submit-error"></div>
<div id="timeline-submit-area">
<span id="timeline-upload-photo-button" class="btn"><i class="icon-camera"></i></span>
<span id="photo-remove"><span class="icon-remove"></span></span><span id="photo-file-name"></span>
<span id="counter"></span>
<input id="timeline-submit-upload" type="file" name="timeline-submit-upload" enctype="multipart/form-data">
<button id="timeline-submit-button" class="btn btn-primary timeline-submit" tabindex="2" disabled="disabled">投稿</button>
<span id="counter"></span>
</div>
</div>

<div id="timeline-loading" style="text-align: center;"><?php echo op_image_tag('ajax-loader.gif', array()) ?></div>
<div id="timeline-list" data-last-id=""data-loadmore-id="">
</div>

<button class="gorgon-button button" id="timeline-loadmore">もっと読む</button>
<button class="btn btn-small" id="timeline-loadmore">もっと読む</button>
<div id="timeline-loadmore-loading"><?php echo op_image_tag('ajax-loader.gif', array()) ?></div>
</div>

Expand Down
3 changes: 1 addition & 2 deletions apps/pc_frontend/modules/timeline/templates/_timelineMentions.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,13 +14,12 @@


<?php use_javascript('/opTimelinePlugin/js/timeline-loader.api.js') ?>
<?php use_stylesheet('/opTimelinePlugin/css/bootstrap.css', 'last') ?>
<?php use_stylesheet('/opTimelinePlugin/css/timeline.css', 'last') ?>

<script type="text/javascript">
$(function(){
$("#timeline-textarea").focus(function(){
$('.timeline-postform').css('padding-bottom', '30px');
$('.timeline-postform').css('padding-bottom', '35px');
$('#timeline-textarea').attr('rows', '3');
$('#timeline-submit-area').css('display', 'inline');
});
Expand Down
5 changes: 2 additions & 3 deletions apps/pc_frontend/modules/timeline/templates/_timelineProfile.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,6 @@
<?php use_javascript('/opTimelinePlugin/js/jquery.timeago.js', 'last') ?>
<?php use_javascript('/opTimelinePlugin/js/lightbox.js', 'last') ?>
<?php use_stylesheet('/opTimelinePlugin/css/lightbox.css', 'last') ?>
<?php use_stylesheet('/opTimelinePlugin/css/bootstrap.css', 'last') ?>
<?php use_stylesheet('/opTimelinePlugin/css/timeline.css', 'last') ?>

<?php include_partial('timeline/timelineTemplate') ?>
Expand All @@ -38,8 +37,8 @@
<div id="timeline-list" data-last-id=""data-loadmore-id="">
</div>

<button class="gorgon-button button" id="timeline-loadmore">もっと読む</button>
<button class="btn btn-small" id="timeline-loadmore">もっと読む</button>
<div id="timeline-loadmore-loading"><?php echo op_image_tag('ajax-loader.gif', array()) ?></div>
</div>

</div></div>
</div></div>
3 changes: 1 addition & 2 deletions apps/pc_frontend/modules/timeline/templates/_timelineTemplate.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,6 @@
<div class="timeline-post-control">
<a class="timeline-comment-link">コメントする</a>{{if member.self==true}} | <a href="#timeline-post-delete-confirm-${id}" class="timeline-post-delete-confirm-link">削除する</a>
{{/if}} | <a href="<?php echo url_for('@homepage', array('absolute' => true)) ?>timeline/show/id/${id}"><span class="timestamp timeago" title="${created_at}"></span></a>

<a>
<div id="timeline-comment-loadmore-${id}" data-timeline-id="${id}" class="timeline-comment-loadmore">
<i class="icon-comment"></i>&nbsp;以前のコメントを見る
Expand All @@ -37,7 +36,7 @@

<div id="timeline-post-comment-form-${id}" class="timeline-post-comment-form">
<input class="timeline-post-comment-form-input" data-timeline-id="${id}" id="comment-textarea-${id}" type="text" />
<button data-timeline-id="${id}" class="btn btn-primary btn-mini timeline-comment-button" disabled="disabled">投稿</button>
<button data-timeline-id="${id}" class="btn btn-primary btn-small timeline-comment-button" disabled="disabled">投稿</button>
</div>
<div id="timeline-post-comment-form-loader-${id}" class="timeline-post-comment-form-loader">
<?php echo op_image_tag('ajax-loader.gif', array()) ?>
Expand Down
4 changes: 1 addition & 3 deletions apps/pc_frontend/modules/timeline/templates/showSuccess.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@
<?php use_javascript('/opTimelinePlugin/js/timeline-loader.api.js', 'last') ?>
<?php use_javascript('/opTimelinePlugin/js/lightbox.js', 'last') ?>
<?php use_stylesheet('/opTimelinePlugin/css/lightbox.css', 'last') ?>
<?php use_stylesheet('/opTimelinePlugin/css/bootstrap.css', 'last') ?>
<?php use_stylesheet('/opTimelinePlugin/css/timeline.css', 'last') ?>

<?php include_partial('timeline/timelineTemplate') ?>
Expand All @@ -31,5 +30,4 @@
<div id="timeline-list" data-last-id=""data-loadmore-id="">

</div>
</div>

</div>
Loading