Commit 11b88601 authored by Jonny Bradley's avatar Jonny Bradley

[MRG] Automatic merge, branches/7.x 34372 to 34390

parent 5b55350d
......@@ -4378,10 +4378,11 @@ styles/tikinewt/tikinewt.png -text
styles/twist/arrows-000.png -text svneol=unset#image/png
styles/twist/background.gif -text
styles/twist/bullet.gif -text
styles/twist/header.jpg -text svneol=unset#image/jpeg
styles/twist/header_bg.jpg -text svneol=unset#image/jpeg
styles/twist/index.php -text
styles/twist/pics/icons/folder.png -text svneol=unset#image/png
styles/twist/pics/icons/ofolder.png -text svneol=unset#image/png
styles/twist/topbar_bg.jpg -text svneol=unset#image/jpeg
styles/twist/twist.png -text svneol=unset#image/png
temp/.htaccess -text
temp/README -text
......
......@@ -350,6 +350,10 @@ a.admbox.off img {
display: none;
}
#save_modules {
display: none;
}
/* end modules revamp */
/* tiki 7 theme generator *
......
......@@ -64,6 +64,8 @@ class Tracker_Field_Text extends Tracker_Field_Abstract
'lingualvalue' => array(),
'lingualpvalue' => array(),
);
// Trim ending \n added by parsing
$data['pvalue'] = trim($data['pvalue'], "\n");
if ($this->getConfiguration("isMultilingual") == 'y') {
if (! is_array($requestData[$id_string])) {
......
......@@ -325,7 +325,7 @@ class CreditsLib extends TikiLib
return 0;
} else {
$this->query( "UPDATE `tiki_credits` SET `used_amount` = `total_amount` WHERE `creditId `= ?",
$this->query( "UPDATE `tiki_credits` SET `used_amount` = `total_amount` WHERE `creditId`= ?",
array( $creditId ) );
return $amount - $available;
......
......@@ -26,13 +26,33 @@ $(".module", dragZonesSelector).each(function() {
}
});
var modAdminDirty = false;
$(document).ready(function() {
$(window).bind("beforeunload", function( e ) {
if (modAdminDirty) {
var m = tr("You have unsaved changes to your modules, are you sure you want to leave the page without saving?");
var e = e || window.event;
if (e && !($.browser.safari || $.browser.webkit)) {
e.returnValue = m;
}
return m;
} else {
return null;
}
});
});
$(".modules").sortable( {
connectWith: ".modules",
items: ".module:not('.ui-draggable')",
placeholder: "module-placeholder",
revert: 200,
stop: function (event, ui) {
$("#save_modules a").show("fast").attr("sortable", $(this).attr("id"));
if ($("#save_modules a:visible").length === 0) {
$("#save_modules a").show("fast").attr("sortable", $(this).attr("id"))
.parent().show("fast");
modAdminDirty = true;
}
},
start: function (event, ui) {
......@@ -112,6 +132,7 @@ $("#module_list li").draggable({
$("#save_modules a").click(function(evt) {
if ($(this).attr("sortable")) {
// save module order
modAdminDirty = false;
var ser = {};
$(".modules").each(function() { /* do this on everything of class "modules" */
ser[$(this).attr("id")] = $(this).find(".module").map(function() { /* do this on each child module */
......
......@@ -215,7 +215,7 @@ function wikiplugin_articles($data, $params)
extract($params, EXTR_SKIP);
$filter = '';
if (($prefs['feature_articles'] != 'y') || (($tiki_p_read_article != 'y') && ($tiki_p_articles_read_heading != 'y'))) {
if ($prefs['feature_articles'] != 'y') {
// the feature is disabled or the user can't read articles, not even article headings
return("");
}
......
......@@ -787,8 +787,6 @@ function wikiplugin_img_info() {
$fwidth = $imageObj->width;
$fheight = $imageObj->height;
}
$width = $fwidth;
$height = $fheight;
//get image gal thumbnail image for height and width
if (!empty($dbinfot['data']) || !empty($dbinfot['path'])) {
if (!empty($dbinfot['data'])) {
......@@ -976,6 +974,8 @@ function wikiplugin_img_info() {
$imgdata_dim = '';
$height = $fheight;
$width = $fwidth;
$imgdata_dim .= ' width="' . $width . '"';
$imgdata_dim .= ' height="' . $height . '"';
}
} else {
if (!empty($height)) {
......
......@@ -450,6 +450,7 @@ function wikiplugin_trackerFilter_get_filters($trackerId=0, $listfields='', &$fo
break;
case 'd': // drop down list
case 'y': // country
case 'g': // group selector
$formats[$fieldId] = 'd';
break;
case 'R': // radio
......
......@@ -33,7 +33,7 @@ class EditLib
"<b>$page</b>.\n<p>\n";
$error_msg .= tra("That page is an alias for the following pages").": ";
foreach ($aliases as $an_alias) {
$error_msg .= '<a href="'.$wikilib->editpage_url($an_alias['fromPage']).'">'.$an_alias['fromPage'].'</a>, ';
$error_msg .= '<a href="'.$wikilib->editpage_url($an_alias['fromPage'], false).'">'.$an_alias['fromPage'].'</a>, ';
}
$error_msg .= "\n<p>\n";
$error_msg .= tra("If you want to create the page, you must first edit each the pages above, and remove the alias link it may contain. This link should look something like this");
......@@ -273,6 +273,7 @@ class EditLib
['first_tr'] = flag: 'is <table> was just before this <tr>'
*/
function walk_and_parse(&$c, &$src, &$p, $head_url ) {
global $prefs;
// If no string
if(!$c) { return; }
......
/* $Id$
Twist for TikiWiki CMS/Broupware 1.9 was created by Gary Griffin and
contributed for downloading at http://themes.tiki.org.
The Twist theme has been updated and
The Twist theme was updated and
committed to the Tiki Subversion repository by Gary Cunningham-Lee (chibaguy).
*/
......@@ -13,16 +13,17 @@
/***** XHTML Elements (body tag here,
others follow Layout) *****/
body {
background: #0F1644 url(twist/background.gif);
background: #0f1644 url(twist/background.gif);
font: 76%/1.4em Verdana, Geneva, Arial, Helvetica, sans-serif;
color: black;
}
/* next two: fixed-width: 800px */
body.fixed_width #fixedwidth {
.fixed_width #fixedwidth {
margin-top: 0;
margin-bottom: 20px;
width: 800px;
background: #fff;
background: #0F1644 url(twist/background.gif);
}
body.cke_show_borders {
......@@ -34,6 +35,10 @@ body.cke_show_borders {
margin-top: 0;
}
.middle_outer {
background: #fff;
}
*:first-child+html #c1c2 {
margin-left: 0;
padding-left: 0}
......@@ -87,6 +92,9 @@ body.cke_show_borders {
margin-top: 0;
padding-bottom: 8px;
padding-top: 7px}
.middle_outer {
}
/***** XHTML Elements (other than body tag) ******/
a,
......@@ -184,20 +192,22 @@ input[type="submit"]:active,
.submitbutton:active {border-color: #223845 #41cbe7 #41cbe7 #223845}
input[type=checkbox] {border: 0}
form.admin input[name="features"] {margin-bottom: 3px !important}
select[name="theme"] {width: 125px}
/***** Site Header & Identity *****/
.fixed_width .header_fixedwidth {
width: auto !important;
}
.header_fixedwidth {
background: url(twist/header.jpg) no-repeat 100% 100%;
background: url(twist/header_bg.jpg) no-repeat 100% 100%;
color: #fff;
padding-right: 30px;
}
.header {
background: url(twist/header.jpg) no-repeat 0 100%;
margin-right: 22px;
padding-left: 30px;
width: inherit;
#header {
background: url(twist/header_bg.jpg) no-repeat 0 100%;
text-align: left;
padding-left: 22px;
}
.header a,
......@@ -205,58 +215,65 @@ select[name="theme"] {width: 125px}
#top_modules {
min-height: 82px;
padding: 30px 0 0 0;
margin: 0;
height: 100%;
}
.siteloginbar_popup {
color: #fff;
bottom: 0;
position: absolute;
#top_modules .box-logo {
height: 100%;
}
#top_modules #sitelogo img {
margin: 10px;
}
#siteloginbar a,
#siteloginbar a:visited {
text-decoration: none;
color: #fff;
#top_modules #sitetitles {
margin: 4% 0 2% 10px;
}
#siteloginbar input,
#sitesearchbar input,
#sitesearchbar select {
background: #185981;
color: #fff;
border: 1px solid #083c6e;
#top_modules .module.secondary_site_menu {
position: absolute;
bottom: 4px;
right: 10px;
}
#siteloginbar_popup li {
background: #eee;
#top_modules .box-login_box {
color: #fff;
position: absolute;
top: 0;
right: 10px;
}
#siteloginbar_popup .cssmenu_horiz li ul {
margin-top: -6px;
.siteloginbar_popup .tabmark {
float: left;
background: none;
border: 1px solid #3a759d;
}
#siteloginbar_popup ul ul li a,
#siteloginbar_popup ul ul li a:visited {
color: #990066;
.siteloginbar_popup .tabmark a,
.siteloginbar_popup .tabmark a:hover,
.siteloginbar_popup label {
color: white;
}
#siteloginbar_popup li.login_link,
#siteloginbar_popup li.login_link a:hover {
.siteloginbar_popup .tabmark a:hover {
background: none;
}
#sitesearchbar select option {
.siteloginbar a,
.siteloginbar a:visited {
text-decoration: none;
color: #fff;
}
/*
#sitetitles {
position: absolute;
left: 0;
bottom: 0}
*/
.siteloginbar_popup .cssmenu_horiz ul li {
background: url(twist/background.gif) !important;
}
.siteloginbar_poppedup {
margin-top: -10px;
}
#sitetitle {
font-size: 2.4em;
color: #fff;
......@@ -270,18 +287,24 @@ select[name="theme"] {width: 125px}
#tiki-top {
position: absolute;
bottom: 13px;
right: 18px;
bottom: 0;
left: 300px;
font-weight: bold;
font-size: 11px;
color: #fff;
height: 26px}
#tiki-top a,
#tiki-top a:visited {
#tiki-top a:visited,
.secondary_site_menu .cssmenu_horiz ul li a,
.secondary_site_menu .cssmenu_horiz ul li a:visited {
color: black !important;
text-decoration: none !important}
#secondary_site_menu .cssmenu_horiz > li:hover {
background: none;
}
#tiki-top .findtable {
margin-bottom: 0;
}
......@@ -293,6 +316,20 @@ select[name="theme"] {width: 125px}
margin-right: 10px;
}
.middle {
background: url(twist/topbar_bg.jpg) no-repeat 100% 0;
}
#topbar_modules {
background: url(twist/topbar_bg.jpg) no-repeat;
min-height: 26px;
padding-left: 22px;
}
#topbar_modules .box-menu {
float: right;
}
#topbar_custom_code {
background: #fff;
color: #000;
......@@ -767,8 +804,8 @@ tr.diffheader a,
}
.statuson {
background: #abcdef;,
border: 1px inset #abcdef
background: #abcdef;
border: 1px inset #abcdef;
}
/***** Wiki *****/
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment