Menu
▾
▴
[xoops-svn] SF.net SVN: xoops:[8861] XoopsModules/smallworld/trunk/smallworld
|
From: <dj...@us...> - 2012-01-31 20:07:46
|
Revision: 8861
http://xoops.svn.sourceforge.net/xoops/?rev=8861&view=rev
Author: djculex
Date: 2012-01-31 20:07:37 +0000 (Tue, 31 Jan 2012)
Log Message:
-----------
- Return only year in education & job fields
- Adjusted css for Crome, Opera, IE and FF
Modified Paths:
--------------
XoopsModules/smallworld/trunk/smallworld/class/db.php
XoopsModules/smallworld/trunk/smallworld/css/smallworld.css
XoopsModules/smallworld/trunk/smallworld/include/functions.php
XoopsModules/smallworld/trunk/smallworld/js/jquery.stepy.js
XoopsModules/smallworld/trunk/smallworld/js/smallworld.js
Modified: XoopsModules/smallworld/trunk/smallworld/class/db.php
===================================================================
--- XoopsModules/smallworld/trunk/smallworld/class/db.php 2012-01-31 20:06:11 UTC (rev 8860)
+++ XoopsModules/smallworld/trunk/smallworld/class/db.php 2012-01-31 20:07:37 UTC (rev 8861)
@@ -39,8 +39,8 @@
while ($start<=$end) {
$msg[$start]['employer'] = $employer[$start];
$msg[$start]['position'] = $position[$start];
- $msg[$start]['jobstart'] = date('d-m-Y',$jobstart[$start]);
- $msg[$start]['jobstop'] = date('d-m-Y',$jobstop[$start]);
+ $msg[$start]['jobstart'] = $jobstart[$start];
+ $msg[$start]['jobstop'] = $jobstop[$start];
$msg[$start]['description'] = $description[$start];
$start++;
}
@@ -64,8 +64,8 @@
while ($start<=$end) {
$msg[$start]['school_type'] = $school_type[$start];
$msg[$start]['school'] = $arr7[$school[$start]];
- $msg[$start]['schoolstart'] = date('d-m-Y',$schoolstart[$start]);
- $msg[$start]['schoolstop'] = date('d-m-Y',$schoolstop[$start]);
+ $msg[$start]['schoolstart'] = date('Y',$schoolstart[$start]);
+ $msg[$start]['schoolstop'] = date('Y',$schoolstop[$start]);
$start++;
}
return $msg;
@@ -185,8 +185,8 @@
$schoolstop = Smallworld_sanitize(serialize(Smallworld_DateOfArray ($_POST['schoolstop'])));
$jobemployer = Smallworld_sanitize(serialize($_POST['employer']));
$jobposition = Smallworld_sanitize(serialize($_POST['position']));
- $jobstart = Smallworld_sanitize(serialize(Smallworld_DateOfArray ($_POST['jobstart'])));
- $jobstop = Smallworld_sanitize(serialize(Smallworld_DateOfArray ($_POST['jobstop'])));
+ $jobstart = Smallworld_sanitize(serialize(Smallworld_YearOfArray ($_POST['jobstart'])));
+ $jobstop = Smallworld_sanitize(serialize(Smallworld_YearOfArray ($_POST['jobstop'])));
$jobdescription = Smallworld_sanitize(serialize($_POST['description']));
$sql = '';
Modified: XoopsModules/smallworld/trunk/smallworld/css/smallworld.css
===================================================================
--- XoopsModules/smallworld/trunk/smallworld/css/smallworld.css 2012-01-31 20:06:11 UTC (rev 8860)
+++ XoopsModules/smallworld/trunk/smallworld/css/smallworld.css 2012-01-31 20:07:37 UTC (rev 8861)
@@ -162,7 +162,6 @@
border-left: none;
background: #eef;
padding: 10px 20px 20px;
- width: 90%;
}
#smallworld_messagecounter_id {
@@ -225,19 +224,16 @@
}
.smallworld_content legend {
background-color:#FFCCFF;
-
border-width:1px 0px 1px 0px;
border-style:solid;
border-color:#333333;
-
color:#333333;
font-size:110%;
font-weight:600;
-
padding:3px 5px;
- margin:0px 0px 2px 0px;
+ /*margin:0px 0px 2px 0px;
position:relative;
- top: -15px;
+ top: -15px;*/
}
.smallworld_content label {
color:#888;
@@ -363,18 +359,38 @@
a.button-back:hover, a.button-next:hover, .finish:hover { background-color: #69C; }
-fieldset.step { border: 1px solid #DDD; clear: left; font: 10px verdana;}
+fieldset.step {
+ border: 1px solid #DDD;
+ clear: left;
+ font: 10px verdana;
+}
+
fieldset.step label {
color: #444444;
display: block;
font: bold 10px verdana;
margin: 0 0 0 2px;
}
-fieldset.step legend { color: #4080BF; font: bold 14px verdana; padding: 0 2px 3px 2px; }
-fieldset.step input, fieldset.step textarea, fieldset.step select { border: 1px solid #AAA; font: 10px verdana; margin-left: 7px; }
+fieldset.step legend {
+ color: #4080BF;
+ font: bold 14px verdana;
+ padding: 0 2px 3px 2px;
+}
-li.error-image { background: url('../images/error.png') no-repeat right top; }
+fieldset.step input, fieldset.step textarea, fieldset.step select {
+ border: 1px solid #AAA;
+ font: 10px verdana;
+ margin-left: 7px;
+}
+fieldset.step #realname, #partner, input[name='emailtype[]'], input[name='screenname_type[]'] {
+ width:40%;
+}
+
+li.error-image {
+ background: url('../images/error.png') no-repeat right top;
+}
+
ul.stepy-titles { list-style: none; margin: 0; padding: 0; width: 100%; }
ul.stepy-titles li { color: #DDD; cursor: pointer; font: bold 18px verdana; float: left; padding: 10px; }
ul.stepy-titles li.current-step { color: #369; cursor: auto; }
@@ -527,7 +543,7 @@
position:absolute;
left:150px;
margin: 0 10px 0 0;
- width: 55px;
+ width: 10%;
}
input.job,input.jobdesc {
Modified: XoopsModules/smallworld/trunk/smallworld/include/functions.php
===================================================================
--- XoopsModules/smallworld/trunk/smallworld/include/functions.php 2012-01-31 20:06:11 UTC (rev 8860)
+++ XoopsModules/smallworld/trunk/smallworld/include/functions.php 2012-01-31 20:07:37 UTC (rev 8861)
@@ -92,6 +92,14 @@
return $data;
}
+function Smallworld_YearOfArray ($array) {
+ $data = array();
+ foreach ($array as $k => $v) {
+ $data[$k] = $v;
+ }
+ return $data;
+}
+
function Smallworld_CreateIndexFiles ($folderUrl) {
$myts =& MyTextSanitizer::getInstance();
file_put_contents($folderUrl.'index.html', "<script>history.go(-1);</script>");
Modified: XoopsModules/smallworld/trunk/smallworld/js/jquery.stepy.js
===================================================================
--- XoopsModules/smallworld/trunk/smallworld/js/jquery.stepy.js 2012-01-31 20:06:11 UTC (rev 8860)
+++ XoopsModules/smallworld/trunk/smallworld/js/jquery.stepy.js 2012-01-31 20:07:37 UTC (rev 8861)
@@ -57,7 +57,7 @@
xoops_smallworldtitlesWrapper = xoops_smallworld('<ul/>', { id: id + '-titles', 'class': 'stepy-titles' }),
description = '',
title = '',
- xoops_smallworldlegend = null,
+ xoops_smallworldlegend = false,
hasLegend = true,
isForm = xoops_smallworldthis.is('form'),
onSubmit = '',
Modified: XoopsModules/smallworld/trunk/smallworld/js/smallworld.js
===================================================================
--- XoopsModules/smallworld/trunk/smallworld/js/smallworld.js 2012-01-31 20:06:11 UTC (rev 8860)
+++ XoopsModules/smallworld/trunk/smallworld/js/smallworld.js 2012-01-31 20:07:37 UTC (rev 8861)
@@ -41,7 +41,7 @@
if (xoops_smallworld('#smallworld_regform1').length) { // implies *not* zero
xoops_smallworld('#smallworld_regform1').show();
xoops_smallworld.fn.colorbox({
- width:"auto",
+ width:"50%",
height:"70%",
inline:true,
onComplete: function() {
@@ -175,15 +175,15 @@
xoops_smallworld(".jobstart" ).datepicker({
changeMonth: true,
changeYear: true,
- dateFormat: 'dd-mm-yy',
- yearRange: '-100:+0'
+ dateFormat: 'yy',
+ yearRange: '-100:+0',
});
// Attach jquery-ui datepicker to form.
xoops_smallworld(".jobstop" ).datepicker({
changeMonth: true,
changeYear: true,
- dateFormat: 'dd-mm-yy',
+ dateFormat: 'yy',
yearRange: '-100:+0'
});
@@ -404,7 +404,7 @@
};
}); //close click
});
-
+
// Attach on clik open education & work (..more) dialogues
xoops_smallworld('#_smallworld_workmore').live('click',function(){
if (xoops_smallworld('#workfull').length) { // implies *not* zero
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
