harukin/core
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/redmatrix/redmatrix

Browse Source 
Conflicts:
	include/identity.php
	include/widgets.php
	util/messages.po
	view/it/messages.po
	view/it/strings.php
This commit is contained in:
redmatrix 2015-07-19 21:08:34 -07:00
commit 15b6e8faa4
6 changed files with 50 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
include/identity.php
View File

@ -630,7 +630,6 @@ function identity_export_year($channel_id,$year) {
}
/**
* @brief Loads a profile into the App structure.
*

10
include/items.php
View File

@ -2685,11 +2685,12 @@ function item_store_update($arr,$allow_exec = false) {
return $ret;
}
$r = q("delete from term where oid = %d and otype = %d",
intval($orig_post_id),
intval(TERM_OBJ_POST)
);
if(is_array($terms)) {
$r = q("delete from term where oid = %d and otype = %d",
intval($orig_post_id),
intval(TERM_OBJ_POST)
);
foreach($terms as $t) {
q("insert into term (uid,oid,otype,type,term,url)
values(%d,%d,%d,%d,'%s','%s') ",
@ -2701,7 +2702,6 @@ function item_store_update($arr,$allow_exec = false) {
dbesc($t['url'])
);
}
$arr['term'] = $terms;
}

1
include/widgets.php
View File

@ -380,6 +380,7 @@ function widget_categories($arr) {
$srchurl = str_replace(array('?f=','&f='),array('',''),$srchurl);
return categories_widget($srchurl, $cat);
}
function widget_tagcloud_wall($arr) {

11
index.php
View File

@ -195,6 +195,17 @@ if(strlen($a->module)) {
}
}
/**
* This provides a place for plugins to register module handlers which don't otherwise exist on the system.
* If the plugin sets 'installed' to true we won't throw a 404 error for the specified module even if
* there is no specific module file or matching plugin name.
* The plugin should catch at least one of the module hooks for this URL.
*/
$x = array('module' => $a->module, 'installed' => false);
call_hooks('module_loaded', $x);
if($x['installed'])
$a->module_loaded = true;
/**
* The URL provided does not resolve to a valid module.

2
version.inc
View File

@ -1 +1 @@
2015-07-15.1094
2015-07-19.1098

77
view/tpl/photo_view.tpl
View File

@ -2,7 +2,6 @@
<div class="generic-content-wrapper">
<div class="section-title-wrapper">
<div class="pull-right">
{{if $tools}}
<a class="btn btn-default btn-xs" title="{{$tools.profile.1}}" href="{{$tools.profile.0}}"><i class="icon-user"></i></a>
{{/if}}
@ -11,7 +10,6 @@
<i class="icon-globe btn btn-default btn-xs" title="{{$map_text}}" onclick="var pos = $('#photo-map').css('position'); if(pos === 'absolute') { $('#photo-map').css( { position: 'relative', left: 'auto', top: 'auto' }); } else { $('#photo-map').css( { position: 'absolute', left: '-9999px', top: '-9999px' }); }" ></i>
</div>
{{/if}}
<div class="btn-group btn-group dropdown">
{{if $edit}}
<i class="icon-pencil btn btn-default btn-xs" title="{{$edit.edit}}" onclick="openClose('photo-edit');"></i>
@ -29,11 +27,8 @@
{{/if}}
</div>
</div>
<h2>{{if $desc}}{{$desc}}{{elseif $filename}}{{$filename}}{{else}}{{$unknown}}{{/if}}</h2>
<div class="clear"></div>
</div>
<div id="photo-map">
{{$map}}
@ -88,12 +83,9 @@
</form>
<div id="photo-edit-end" class="clear"></div>
</div>
<div id="photo-view-wrapper">
<div id="photo-photo"><a href="{{$photo.href}}" title="{{$photo.title}}" onclick="$.colorbox({href: '{{$photo.href}}'}); return false;"><img style="width: 100%;" src="{{$photo.src}}"></a></div>
<div id="photo-photo-end" class="clear"></div>
{{if $tags}}
<div class="photo-item-tools-left" id="in-this-photo">
<span id="in-this-photo-text">{{$tag_hdr}}</span>
@ -102,31 +94,29 @@
{{/foreach}}
</div>
{{/if}}
<div class="photo-item-tools">
{{if $responses.count }}
<div class="photo-item-tools-left pull-left">
<div class="{{if $responses.count > 1}}btn-group{{/if}}">
{{foreach $responses as $verb=>$response}}
{{if $response.count}}
<div class="btn-group">
<button type="button" class="btn btn-default btn-sm wall-item-like dropdown-toggle" data-toggle="dropdown" id="wall-item-{{$verb}}-{{$id}}">{{$response.count}} {{$response.button}}</button>
{{if $response.list_part}}
<ul class="dropdown-menu" role="menu" aria-labelledby="wall-item-{{$verb}}-{{$id}}">{{foreach $response.list_part as $liker}}<li role="presentation">{{$liker}}</li>{{/foreach}}</ul>
{{else}}
<ul class="dropdown-menu" role="menu" aria-labelledby="wall-item-{{$verb}}-{{$id}}">{{foreach $response.list as $liker}}<li role="presentation">{{$liker}}</li>{{/foreach}}</ul>
{{/if}}
{{if $response.list_part}}
{{if $responses.count }}
<div class="photo-item-tools-left pull-left">
<div class="{{if $responses.count > 1}}btn-group{{/if}}">
{{foreach $responses as $verb=>$response}}
{{if $response.count}}
<div class="btn-group">
<button type="button" class="btn btn-default btn-sm wall-item-like dropdown-toggle" data-toggle="dropdown" id="wall-item-{{$verb}}-{{$id}}">{{$response.count}} {{$response.button}}</button>
{{if $response.list_part}}
<ul class="dropdown-menu" role="menu" aria-labelledby="wall-item-{{$verb}}-{{$id}}">{{foreach $response.list_part as $liker}}<li role="presentation">{{$liker}}</li>{{/foreach}}</ul>
{{else}}
<ul class="dropdown-menu" role="menu" aria-labelledby="wall-item-{{$verb}}-{{$id}}">{{foreach $response.list as $liker}}<li role="presentation">{{$liker}}</li>{{/foreach}}</ul>
{{/if}}
{{if $response.list_part}}
<div class="modal" id="{{$verb}}Modal-{{$id}}">
<div class="modal-dialog">
<div class="modal-content">
<div class="modal-header">
<button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
<h4 class="modal-title">{{$response.title}}</h4>
<h4 class="modal-title">{{$response.title}}</h4>
</div>
<div class="modal-body">
<ul>{{foreach $response.list as $liker}}<li role="presentation">{{$liker}}</li>{{/foreach}}</ul>
<ul>{{foreach $response.list as $liker}}<li role="presentation">{{$liker}}</li>{{/foreach}}</ul>
</div>
<div class="modal-footer clear">
<button type="button" class="btn btn-default" data-dismiss="modal">{{$modal_dismiss}}</button>
@ -134,37 +124,34 @@
</div><!-- /.modal-content -->
</div><!-- /.modal-dialog -->
</div><!-- /.modal -->
{{/if}}
</div>
{{/if}}
{{/foreach}}
</div>
{{/if}}
{{/foreach}}
</div>
{{/if}}
{{if $likebuttons}}
<div class="photo-item-tools-right btn-group pull-right">
<button type="button" class="btn btn-default btn-sm" onclick="dolike({{$id}},'like'); return false">
<i class="icon-thumbs-up-alt" title="{{$likethis}}"></i>
</button>
<button type="button" class="btn btn-default btn-sm" onclick="dolike({{$id}},'dislike'); return false">
<i class="icon-thumbs-down-alt" title="{{$nolike}}"></i>
</button>
</div>
<div id="like-rotator-{{$id}}" class="photo-like-rotator pull-right"></div>
{{/if}}
<div class="clear"></div>
</div>
{{/if}}
</div>
{{if $likebuttons}}
<div class="photo-item-tools-right btn-group pull-right">
<button type="button" class="btn btn-default btn-sm" onclick="dolike({{$id}},'like'); return false">
<i class="icon-thumbs-up-alt" title="{{$likethis}}"></i>
</button>
<button type="button" class="btn btn-default btn-sm" onclick="dolike({{$id}},'dislike'); return false">
<i class="icon-thumbs-down-alt" title="{{$nolike}}"></i>
</button>
</div>
<div id="like-rotator-{{$id}}" class="photo-like-rotator pull-right"></div>
{{/if}}
<div class="clear"></div>
</div>
{{$comments}}
{{if $commentbox}}
<div class="wall-item-comment-wrapper{{if $comments}} wall-item-comment-wrapper-wc{{/if}}" >
{{$commentbox}}
</div>
{{/if}}
<div class="clear"></div>
</div>
{{$paginate}}