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

Merge branch '2.0' of github.com:s9y/Serendipity into 2.0

Browse Source
This commit is contained in:
Garvin Hicking
2014-03-10 17:19:59 +01:00
parent 68b93fd1bc 3ce74d7c57
commit 50562d49a9
6 changed files with 66 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/tpl/config_local.inc.php
+3 -3
View File
@@ -1,4 +1,4 @@
<?php # $Id$
<?php #
# Copyright (c) 2003-2005, Jannis Hermanns (on behalf the Serendipity Developer Team)
# All rights reserved. See LICENSE file for licensing details
@@ -445,7 +445,7 @@
'type' => 'bool',
'permission' => 'siteConfiguration',
'default' => false),
/*
array('var' => 'wysiwyg',
'title' => INSTALL_WYSIWYG,
'description' => INSTALL_WYSIWYG_DESC,
@@ -453,7 +453,7 @@
'default' => false,
'permission' => 'blogConfiguration',
'flags' => array('simpleInstall', 'installOnly')),
*/
array('var' => 'enablePopup',
'title' => INSTALL_POPUP,
'description' => INSTALL_POPUP_DESC,
plugins/serendipity_event_karma/serendipity_event_karma.php
+1 -1
View File
@@ -1748,7 +1748,7 @@ END_IMG_CSS;
<li class='prev'>$linkPrevious</li>
<li class='next'>$linkNext</li>
</ul>
<nav>
</nav>
</div>
");
if (is_array($sql)) {
plugins/serendipity_event_mailer/serendipity_event_mailer.php
+15 -8
View File
@@ -155,14 +155,21 @@ class serendipity_event_mailer extends serendipity_event
}
?>
<fieldset style="margin: 5px">
<legend><?php echo PLUGIN_EVENT_MAILER_NAME; ?></legend>
<input class="input_checkbox" type="checkbox" name="serendipity[properties][sendentry]" id="properties_sendentry" value="true" checked="checked" />
<label title="<?php echo PLUGIN_EVENT_MAILER_SENDING; ?>" for="properties_sendentry">&nbsp;<?php echo PLUGIN_EVENT_MAILER_ISTOSENDIT; ?></label><br />
<label title="<?php echo PLUGIN_EVENT_MAILER_RECIPIENT; ?>" for="properties_mailto">&nbsp;<?php echo PLUGIN_EVENT_MAILER_RECIPIENTS; ?>&nbsp;&nbsp;</label>&nbsp;
<input class="input_textbox" type="text" name="serendipity[properties][mailto]" id="properties_mailto" value="<?php echo htmlspecialchars($mailto); ?>" /><br />
<input type="checkbox" value="true" id="sendall" name="serendipity[properties][sendentry_all]" <?php echo ($sendtoall ? 'checked="checked"': ''); ?> />
<label title="<?php echo PLUGIN_EVENT_MAILER_SENDTOALL; ?>" for="sendall">&nbsp;<?php echo PLUGIN_EVENT_MAILER_SENDTOALL; ?></label>
<fieldset class="entryproperties">
<span class="wrap_legend"><legend><?php echo PLUGIN_EVENT_MAILER_NAME; ?></legend></span>
<div class="form_check">
<input id="properties_sendentry" type="checkbox" name="serendipity[properties][sendentry]" value="true" checked="checked">
<label title="<?php echo PLUGIN_EVENT_MAILER_SENDING; ?>" for="properties_sendentry"><?php echo PLUGIN_EVENT_MAILER_ISTOSENDIT; ?></label>
</div>
<div class="form_field">
<label title="<?php echo PLUGIN_EVENT_MAILER_RECIPIENT; ?>" for="properties_mailto"><?php echo PLUGIN_EVENT_MAILER_RECIPIENTS; ?></label>
<input id="properties_mailto" type="text" name="serendipity[properties][mailto]" value="<?php echo htmlspecialchars($mailto); ?>">
</div>
<div class="form_check">
<input id="sendall" type="checkbox" value="true" name="serendipity[properties][sendentry_all]" <?php echo ($sendtoall ? 'checked="checked"': ''); ?>>
<label title="<?php echo PLUGIN_EVENT_MAILER_SENDTOALL; ?>" for="sendall"><?php echo PLUGIN_EVENT_MAILER_SENDTOALL; ?></label>
</div>
</fieldset>
<?php
break;
plugins/serendipity_event_spartacus/serendipity_event_spartacus.php
+7 -10
View File
@@ -357,16 +357,16 @@ class serendipity_event_spartacus extends serendipity_event
function outputMSG($status, $msg) {
switch($status) {
case 'notice':
echo '<div class="serendipityAdminMsgNote msg_notice"><img class="img_error" src="' . serendipity_getTemplateFile('admin/img/admin_msg_note.png') . '" alt="" />' . $msg . '</div>' . "\n";
echo '<span class="msg_notice"><span class="icon-info-circled"></span> '. $msg .'</span>' . "\n";
break;
case 'error':
echo '<div class="serendipityAdminMsgError msg_error"><img class="img_error" src="' . serendipity_getTemplateFile('admin/img/admin_msg_error.png') . '" alt="" />' . $msg . '</div>' . "\n";
echo '<span class="msg_error"><span class="icon-attention-circled"></span> '. $msg .'</span>' . "\n";
break;
default:
case 'success':
echo '<div class="serendipityAdminMsgSuccess msg_success"><img class="img_error" src="' . serendipity_getTemplateFile('admin/img/admin_msg_success.png') . '" alt="" />' . $msg . '</div>' . "\n";
echo '<span class="msg_success"><span class="icon-ok-circled"></span> '. $msg .'</span>' . "\n";
break;
}
}
@@ -462,7 +462,6 @@ class serendipity_event_spartacus extends serendipity_event
if (file_exists($target) && filesize($target) > 0) {
$data = file_get_contents($target);
$this->outputMSG('success', sprintf(PLUGIN_EVENT_SPARTACUS_FETCHED_BYTES_CACHE, strlen($data), $target));
echo "<br />\n";
}
} else {
// Fetch file
@@ -574,7 +573,6 @@ class serendipity_event_spartacus extends serendipity_event
if (strlen($xml) > 0) {
$valid = true;
}
echo '<br /><br />';
}
} else {
@@ -585,7 +583,6 @@ class serendipity_event_spartacus extends serendipity_event
$target = $serendipity['serendipityPath'] . PATH_SMARTY_COMPILE . '/package_' . $url_type . $lang . '.xml';
$xml = $this->fetchfile($url, $target, $cacheTimeout, true);
echo '<br /><br />';
}
$new_crc = md5($xml);
@@ -1135,9 +1132,9 @@ class serendipity_event_spartacus extends serendipity_event
case 'backend_pluginlisting_header':
if (serendipity_db_bool($this->get_config('enable_plugins'))) {
echo '<div id="upgrade_notice" class="serendipityAdminMsgSuccess msg_success">';
echo '<a href="?serendipity[adminModule]=plugins&amp;serendipity[adminAction]=addnew&amp;serendipity[only_group]=UPGRADE" class="serendipityIconLink upgrade_sidebar"><img src="' . serendipity_getTemplateFile('admin/img/upgrade_now.png') . '" style="border: 0px none ; vertical-align: middle; display: inline;" alt="" />' . PLUGIN_EVENT_SPARTACUS_CHECK_SIDEBAR . '</a> &nbsp; ';
echo '<a href="?serendipity[adminModule]=plugins&amp;serendipity[adminAction]=addnew&amp;serendipity[only_group]=UPGRADE&amp;serendipity[type]=event" class="serendipityIconLink upgrade_event"><img src="' . serendipity_getTemplateFile('admin/img/upgrade_now.png') . '" style="border: 0px none ; vertical-align: middle; display: inline;" alt="" />' . PLUGIN_EVENT_SPARTACUS_CHECK_EVENT . '</a> ';
echo '<div id="upgrade_notice" class="clearfix">';
echo '<a id="upgrade_sidebar" class="button_link" href="?serendipity[adminModule]=plugins&amp;serendipity[adminAction]=addnew&amp;serendipity[only_group]=UPGRADE">'. PLUGIN_EVENT_SPARTACUS_CHECK_SIDEBAR .'</a>';
echo '<a id="upgrade_event" class="button_link" href="?serendipity[adminModule]=plugins&amp;serendipity[adminAction]=addnew&amp;serendipity[only_group]=UPGRADE&amp;serendipity[type]=event">'. PLUGIN_EVENT_SPARTACUS_CHECK_EVENT .'</a> ';
echo '</div>';
}
@@ -1145,7 +1142,7 @@ class serendipity_event_spartacus extends serendipity_event
break;
case 'backend_pluginlisting_header_upgrade':
echo '<em>' . PLUGIN_EVENT_SPARTACUS_CHECK_HINT . '</em><br />';
echo '<span class="msg_notice"><span class="icon-info-circled"></span> ' . PLUGIN_EVENT_SPARTACUS_CHECK_HINT . '</span>';
return true;
break;
plugins/serendipity_event_weblogping/serendipity_event_weblogping.php
+12 -6
View File
@@ -103,8 +103,9 @@ class serendipity_event_weblogping extends serendipity_event
switch($event) {
case 'backend_display':
?>
<fieldset style="margin: 5px">
<legend><?php echo PLUGIN_EVENT_WEBLOGPING_PING; ?></legend>
<fieldset class="entryproperties">
<span class="wrap_legend"><legend><?php echo PLUGIN_EVENT_WEBLOGPING_PING; ?></legend></span>
<div class="ping_services">
<?php
$noneclick = '';
foreach($this->services AS $index => $service) {
@@ -126,13 +127,18 @@ class serendipity_event_weblogping extends serendipity_event
$title = sprintf(PLUGIN_EVENT_WEBLOGPING_SENDINGPING, $service['name'])
. (!empty($service['supersedes']) ? ' ' . sprintf(PLUGIN_EVENT_WEBLOGPING_SUPERSEDES, implode(',', $service['supersedes'])) : '');
?>
<input <?php echo $onclick; ?> class="input_checkbox" style="margin: 0px; padding: 0px; vertical-align: bottom;" type="checkbox" name="serendipity[announce_entries_<?php echo $service['name']; ?>]" id="serendipity[announce_entries_<?php echo $service['name']; ?>]" value="true" <?php echo $selected; ?> />
<label title="<?php echo $title; ?>" style="vertical-align: bottom; margin: 0px; padding: 0px;" for="serendipity[announce_entries_<?php echo $service['name']; ?>]">&nbsp;<?php echo $service['name']; ?>&nbsp;&nbsp;</label><br />
<div class="form_check">
<input <?php echo $onclick; ?> type="checkbox" name="serendipity[announce_entries_<?php echo $service['name']; ?>]" id="serendipity[announce_entries_<?php echo $service['name']; ?>]" value="true" <?php echo $selected; ?>>
<label title="<?php echo $title; ?>" for="serendipity[announce_entries_<?php echo $service['name']; ?>]"><?php echo $service['name']; ?></label>
</div>
<?php
}
?>
<input onclick="<?php echo $noneclick; ?>" class="input_checkbox" style="margin: 0px; padding: 0px; vertical-align: bottom;" type="checkbox" value="none" id="serendipity[announce_entries_none]" />
<label title="<?php echo NONE; ?>" style="vertical-align: bottom; margin: 0px; padding: 0px;" for="serendipity[announce_entries_none]">&nbsp;<?php echo NONE; ?>&nbsp;&nbsp;</label><br />
<div class="form_check">
<input onclick="<?php echo $noneclick; ?>" type="checkbox" value="none" id="serendipity[announce_entries_none]">
<label title="<?php echo NONE; ?>" for="serendipity[announce_entries_none]"><?php echo NONE; ?></label>
</div>
</div>
</fieldset>
<?php
return true;
templates/2k11/admin/style.css
+28 -7
View File
@@ -500,12 +500,14 @@ details,
#maintenance > section > .button_link,
form > a,
form > button,
#content .upgrade_done {
#content .upgrade_done,
#upgrade_notice {
margin-top: 1.5em;
margin-bottom: 1.5em;
}
.overviewListForm > button {
.overviewListForm > button,
.ping_services .form_check {
margin-top: 0;
margin-bottom: 0;
}
@@ -872,7 +874,8 @@ input[type=checkbox],
#toggle_extended,
#toggle_metadata,
#toggle_advanced,
#category_icon {
#category_icon,
#upgrade_notice a {
margin-right: .4em;
}
@@ -1741,7 +1744,10 @@ form > .button_link:first-of-type,
}
.zebra_list .odd,
.option_list .odd,
.option_list .odd {
background: #eee;
}
.upload_form:nth-child(odd),
.upload_form:nth-child(odd) input[type="file"] {
background: #eee;
@@ -2682,6 +2688,15 @@ img.mfp-img {
.media_file_keywords li {
width: 23%;
}
#upgrade_notice {
float: right;
}
#upgrade_notice a {
margin-right: 0;
margin-left: .4em;
}
}
@@ -2732,7 +2747,10 @@ img.mfp-img {
#template_select .even,
.media_pane .even,
#dashboard > .even,
#dashboard > .even {
margin: 0 0 1em 2%;
}
#maintenance > section:nth-child(odd) {
margin: 0 0 1em 2%;
}
@@ -2838,9 +2856,12 @@ img.mfp-img {
.configuration_group .form_area,
.configuration_group fieldset > fieldset,
#template_select .odd,
.plugins_installable > li:nth-child(odd),
.media_pane .odd,
#dashboard > section:last-child,
#dashboard > section:last-child {
clear: left;
}
.plugins_installable > li:nth-child(odd),
.serendipity_statistics > section:nth-child(odd) {
clear: left;
}