mbirth/LuckyCoinkydink
Archived
1
0
Fork 0
Code Issues Pull Requests Activity

Merge branch 'master' of github.com:s9y/Serendipity

Browse Source
This commit is contained in:
Ian
2015-02-04 18:03:17 +01:00
parent d584a7febb b204d8b179
commit a1e0f7c8e9
2 changed files with 19 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
templates/2k11/admin/plugin_config_item.tpl
View File

@@ -55,12 +55,15 @@
{elseif $ctype == 'media'}
<div class="clearfix form_field media_choose{if $cdesc != ''} has_info{/if}">
<label for="serendipity[{$postKey}][{$config_item}]">{$cname}{if $cdesc != ''} <button class="toggle_info button_link" type="button" data-href="#{$postKey}_{$config_item}_info"><span class="icon-info-circled"></span><span class="visuallyhidden"> {$CONST.MORE}</span></button>{/if}</label>
<div class="media_chooser clearfix">
<input id="serendipity[{$postKey}][{$config_item}]" class="change_preview" name="serendipity[{$postKey}][{$config_item}]" type="text" data-configitem="{$config_item}" value="{$value}">
<button class="choose_media" type="button" title="{$CONST.MEDIA_LIBRARY}"><span class="icon-picture"></span><span class="visuallyhidden">{$CONST.MEDIA_LIBRARY}</span></button>
</div>
{if $cdesc != ''}<span id="{$postKey}_{$config_item}_info" class="field_info additional_info">{$cdesc}</span>{/if}
<input id="serendipity[{$postKey}][{$config_item}]" class="change_preview" name="serendipity[{$postKey}][{$config_item}]" type="text" data-configitem="{$config_item}" value="{$value}">{* This should maybe be input[type=file] *}
<button class="choose_media" type="button" title="{$CONST.MEDIA_LIBRARY}"><span class="icon-picture"></span><span class="visuallyhidden">{$CONST.MEDIA_LIBRARY}</span></button>
<figure id="{$config_item}_preview">
<figcaption>{$CONST.PREVIEW}</figcaption>
<img src="{$value}" alt="">

18
templates/2k11/admin/style.css
View File

@@ -986,6 +986,7 @@ input[type=checkbox],
.importer_data dd,
.form_buttons > input,
.js .media_choose label,
.js .media_choose input,
.quick_list ol > li,
.serendipity_emoticon_bar {
margin-bottom: .75em;
@@ -2948,12 +2949,21 @@ img.mfp-img {
#serendipity_category > div > div,
#serendipity_category #preview,
#serendipity_category > div > fieldset,
#directory_permissions .form_multiselect {
#directory_permissions .form_multiselect,
.media_chooser {
float: left;
margin: 0 2% 1em 0;
width: 48%;
}
.media_chooser {
margin-bottom: 0;
}
.media_chooser + .field_info {
margin-top: 0;
}
.taxonomy ul {
clear: none;
float: right;
@@ -3069,7 +3079,7 @@ img.mfp-img {
.js .configuration_group .media_choose input {
margin-right: 1%;
max-width: 41.5%;
max-width: none;
}
.info_expanded select,
@@ -3368,10 +3378,6 @@ img.mfp-img {
/* LARGER SCREENS */
@media only screen and (min-width: 1280px) {
.js .configuration_group .media_choose input {
max-width: 42.5%;
}
#edit_entry_metadata #categoryfilter {
max-width: 22em;
min-width: 0;