diff options
| author | Habeas Codice <habeascodice@federated.social> | 2015-02-16 15:13:31 -0800 |
|---|---|---|
| committer | Habeas Codice <habeascodice@federated.social> | 2015-02-16 15:13:31 -0800 |
| commit | d9d029470f188796988e002eb90e9dbf96d3dd29 (patch) | |
| tree | ef922432ae326f358374535bf68492729134e49e /view | |
| parent | ca8e22101803454be60af35d2cf71ae80224805a (diff) | |
| parent | 1d1676094dd82482f113d6de9c2a95407a1a692f (diff) | |
| download | volse-hubzilla-d9d029470f188796988e002eb90e9dbf96d3dd29.tar.gz volse-hubzilla-d9d029470f188796988e002eb90e9dbf96d3dd29.tar.bz2 volse-hubzilla-d9d029470f188796988e002eb90e9dbf96d3dd29.zip | |
Merge branch 'master' of https://github.com/friendica/red
Diffstat (limited to 'view')
| -rw-r--r-- | view/js/main.js | 2 | ||||
| -rw-r--r-- | view/pdl/mod_ratings.pdl | 1 | ||||
| -rw-r--r-- | view/php/theme_init.php | 4 | ||||
| -rw-r--r-- | view/theme/redbasic/css/style.css | 2 | ||||
| -rwxr-xr-x | view/tpl/event.tpl | 1 | ||||
| -rw-r--r-- | view/tpl/prep.tpl | 5 | ||||
| -rw-r--r-- | view/tpl/rating_form.tpl | 2 |
7 files changed, 13 insertions, 4 deletions
diff --git a/view/js/main.js b/view/js/main.js index 17ea42db7..7a6798f2f 100644 --- a/view/js/main.js +++ b/view/js/main.js @@ -713,6 +713,8 @@ function updateConvItems(mode,data) { justifiedGalleryActive = true; $('#photo-album-contents').justifiedGallery({ margins: 3, + border: 0, + ignoreElement: '#page-end', sizeRangeSuffixes: { 'lt100': '-2', 'lt240': '-2', diff --git a/view/pdl/mod_ratings.pdl b/view/pdl/mod_ratings.pdl index 0b6e32283..df1486c9b 100644 --- a/view/pdl/mod_ratings.pdl +++ b/view/pdl/mod_ratings.pdl @@ -1,4 +1,5 @@ [region=aside] +[widget=pubsites][/widget] [widget=vcard][/widget] [widget=rating][/widget] [widget=suggestions][/widget] diff --git a/view/php/theme_init.php b/view/php/theme_init.php index 0009a00e2..b695bd54e 100644 --- a/view/php/theme_init.php +++ b/view/php/theme_init.php @@ -9,11 +9,11 @@ head_add_css('library/jRange/jquery.range.css'); head_add_css('view/css/conversation.css'); head_add_css('view/css/widgets.css'); head_add_css('view/css/colorbox.css'); -head_add_css('library/justifiedGallery/dist/css/justifiedGallery.css'); +head_add_css('library/justifiedGallery/justifiedGallery.css'); head_add_css('library/bootstrap-tagsinput/bootstrap-tagsinput.css'); head_add_js('jquery.js'); head_add_js('jquery-migrate-1.1.1.js'); -head_add_js('library/justifiedGallery/dist/js/jquery.justifiedGallery.js'); +head_add_js('library/justifiedGallery/jquery.justifiedGallery.js'); //head_add_js('jquery-compat.js'); head_add_js('spin.js'); diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css index 6a46d7429..5b24ab731 100644 --- a/view/theme/redbasic/css/style.css +++ b/view/theme/redbasic/css/style.css @@ -992,7 +992,7 @@ nav .acpopup { margin-bottom: 10px; } -.edit-event-link, .plink-event-link { +.edit-event-link, .plink-event-link, .drop-event-link { float: left; margin-top: 4px; margin-right: 4px; diff --git a/view/tpl/event.tpl b/view/tpl/event.tpl index f0e00bd2c..5dfc91ebe 100755 --- a/view/tpl/event.tpl +++ b/view/tpl/event.tpl @@ -8,6 +8,7 @@ <div class="event-buttons"> {{if $event.item.plink}}<a href="{{$event.plink.0}}" title="{{$event.plink.1}}" class="plink-event-link"><i class="icon-external-link btn btn-default" ></i></a>{{/if}} {{if $event.edit}}<a href="{{$event.edit.0}}" title="{{$event.edit.1}}" class="edit-event-link"><i class="icon-pencil btn btn-default"></i></a>{{/if}} + {{if $event.drop}}<a href="{{$event.drop.0}}" title="{{$event.drop.1}}" class="drop-event-link"><i class="icon-trash btn btn-default"></i></a>{{/if}} </div> </div> <div class="clear"></div> diff --git a/view/tpl/prep.tpl b/view/tpl/prep.tpl index 83a86372c..7bef7a417 100644 --- a/view/tpl/prep.tpl +++ b/view/tpl/prep.tpl @@ -1,5 +1,10 @@ <h1>{{$header}}</h1> +{{if $site}} +<h3>{{$website}} {{$site}}</h3> +{{/if}} + + {{if $raters}} {{foreach $raters as $r}} diff --git a/view/tpl/rating_form.tpl b/view/tpl/rating_form.tpl index 216bf6ede..95c2eb03f 100644 --- a/view/tpl/rating_form.tpl +++ b/view/tpl/rating_form.tpl @@ -1,6 +1,6 @@ <h3>{{$header}}</h3> -<div class="rating-target-name">{{$tgt_name}}</div> +<div class="rating-target-name">{{if $site}}{{$website}} {{$site}}{{else}}{{$tgt_name}}{{/if}}</div> <h3>{{$lbl_rating}}</h3> |