Commit d330088a authored by Rene AJM Veerman's avatar Rene AJM Veerman

cosmetic improvements and the start of a features-explosion in #siteManager

parent 3fc0bd82
<?php
//header ('Cache-Control: must-revalidate');
//header ('Expires: Tue, 01 Jan 1980 1:00:00 GMT');
ob_start('ob_gzhandler');
require_once (dirname(__FILE__).'/boot_stage_001.php');
global $saSiteHTTP; global $saSiteDomain; global $saSiteRootFolder; global $saFrameworkFolder;
global $saSiteHD; global $saFrameworkHD;
global $saSiteURL; global $saFrameworkURL;global $saCMS;
$indexContent = $saCMS->resolveTemplateSettings();
echo $indexContent;
//session_destroy(); // enable to test index.boot.php
......
<?php
require_once (dirname(__FILE__).'/../../../sitewide/lib_fileSystem.php');
ob_start('ob_gzhandler');
$rootFolder = dirname(__FILE__).'/../../../siteData/users/';
$relPath = $_REQUEST['path'];
$bgs = getFilePathList ($rootFolder.$relPath.'/thumbnail', false, '/(.*)/', array('file'));
$bgs2 = array();
foreach ($bgs as $idx => $path) {
$r = str_replace (realpath(dirname(__FILE__).'/../../..'), '', $path);
$r = str_replace ('/siteData/users/', '', $r);
$bgs2[] = $r;
}
echo json_encode($bgs2);
?>
sa.dataModels.saMediaAlbum = sa.dm.saMediaAlbum = {
about : {
},
globals : {
},
settings : {
current : {
}
},
html : {
albumView : function (path, callback) {
var
self = sa.dm.saMediaAlbum, g = self.globals, s = self.settings,
url = sa.m.globals.urls.framework+'/businessLogic/saMediaAlbum/1.0.0/',
ajaxCommand = {
url : url + 'ajax_get_albumView.json.php?changed='+sa.m.changedDateTime_current()+'&path='+path,
type : 'GET',
success : function (data,ts,xhr) {
var
d = eval('('+data+')'),
html = self.html.albumView_html (d);
if (typeof callback=='function') callback (html, d);
}
};
jQuery.ajax(ajaxCommand);
},
albumView_html : function (d) {
var html = '';
for (var idx in d) {
var path = sa.m.globals.urls.framework + '/siteData/users/'+d[idx];
html += '<img src="'+path+'" style="margin:14px;box-shadow:5px 5px 5px rgba(0,0,0,0.7),-5px -5px 5px rgba(0,0,0,0.7)"/>';
};
return html;
}
}
};
......@@ -248,6 +248,27 @@ saTree = sa.tree = sa.t = {
},
switchView : function (type, node) {
if (type=='saMediaAlbum') {
sa.dataModels.saMediaAlbum.html.albumView (
sa.tree.currentPath (sa.tree.settings.current.node),
function (html) {
html =
// must be all_scrollpane, not all__scrollpane, otherwise the scrollpane won't initialize properly.
'<div id="siteManager__uploader__all__scrollpane" class="vividScrollpane vividTheme__scroll_black" style="width:'+jQuery('#siteManager__uploader_tab').width()+'px;height:'+(jQuery('#siteManager__uploader_tab').height() - jQuery('#siteManager__tr__uploader_header').height())+'px;">'
+html
+'</div>';
jQuery('.siteManager__uploader__tab').css ({display : 'none'});
jQuery('#siteManager__uploader__all__tab').html (html).css({display:'block'});
setTimeout(function () {
sa.vcc.init (jQuery('#siteManager__uploader__all__tab')[0]);
}, 500);
}
);
}
},
save_node : function (node, callback) {
// save old node data
if (sa.tree.settings.current.node)
......
......@@ -207,7 +207,7 @@ class saCMS {
//reportVariable ('saSources', $saSources);die ();
if (is_null($templateFilepath)) {
$templateFilepath = $saFrameworkHD.'/siteContent/index.tpl';
$templateFilepath = $saFrameworkHD.'/siteContent/index.tpl.html';
}
$templateFileContent = file_get_contents ($templateFilepath);
if (
......
......@@ -60,6 +60,8 @@
'siteFramework:::/saDesktop-2.1.1.source.js' => $absfCurrent.'/saDesktop-2.1.1.source.js',
'siteFramework:::/siteManager/1.0.0/siteManager-1.0.0.source.js' => $absfCurrent.'/siteManager/1.0.0/siteManager-1.0.0.source.js',
'siteFramework:::/businessLogic/saBusinessLogic-1.0.0.source.js' => $absfCurrent.'/businessLogic/saBusinessLogic-1.0.0.source.js',
'siteFramework:::/businessLogic/saMediaAlbum/1.0.0/saMediaAlbum-1.0.0.source.js' => $absfCurrent.'/businessLogic/saMediaAlbum/1.0.0/saMediaAlbum-1.0.0.source.js',
'siteFramework:::/businessLogic/saTree/1.0.0/saTree-1.0.0.source.js' => $absfCurrent.'/businessLogic/saTree/1.0.0/saTree-1.0.0.source.js',
......
......@@ -42,52 +42,11 @@ seductiveapps.desktop = {
systemDialogs : {
resize : function (settings) {
if (jQuery('#siteManager__dialog')[0] && sa.s.c.settings.current.visible['#siteManager']) {
var
animateTo = {
top : jQuery('#siteMenu')[0].offsetTop + jQuery('#siteMenu')[0].offsetHeight + 20,
left : 20,
width : sa.m.browserWidth() - 40,
height : sa.m.browserHeight() - jQuery('#siteMenu')[0].offsetTop - jQuery('#siteMenu')[0].offsetHeight - 40
};
jQuery('#siteManager__dialog').animate (animateTo, {
progress : function () {
sa.vcc.applyTheme ('siteManager');
jQuery('#siteManager__treeview__background').css({
width : jQuery('#siteManager__td__treeview').width(),
height : jQuery('#siteManager__td__treeview').height()
});
},
done : function () {
sa.vcc.applyTheme ('siteManager');
jQuery('#siteManager__treeview__background').css({
width : jQuery('#siteManager__td__treeview').width(),
height : jQuery('#siteManager__td__treeview').height()
});
jQuery('#siteManager > table').css({
width : jQuery('#siteManager').width(),
height : jQuery('#siteManager').height()
});
jQuery('#siteManager__td__content, .siteManager__tab').css ({
width : jQuery('#siteManager').width() * 0.75,
height : jQuery('#siteManager').height()
});
setTimeout (function () {
jQuery('#jQueryFileUpload__scrollpane__container, #jQueryFileUpload__scrollpane, #jQueryFileUpload').css({
width : jQuery('#siteManager__uploader_tab').width(),
height : jQuery('#siteManager__uploader_tab').height() - jQuery('#siteManager__tr__uploader_header').height()
});
setTimeout (function () {
sa.sp.containerSizeChanged (jQuery('#jQueryFileUpload__scrollpane')[0], true);
sa.sp.bindEvents(jQuery('#jQueryFileUpload__scrollpane')[0]);
}, 100);
}, 100);
}
});
sa.siteManager.ui.resize();
}
},
show : function (forDialog, systemDialog_type, html, cssOverrides) {
show : function (forDialog, systemDialog_type, html, cssOverrides, callback) {
// this function provides defaults first, then accepts overrides from cssOverrides. See also {-NOTE:sa.desktop.systemDialogs.show#1-}
var
jQuerydialog = false,
......@@ -333,7 +292,7 @@ seductiveapps.desktop = {
};
//debugger;
sa.desktop.systemDialogs.animate (forDialog, jQuerydialog, html, css, cssOverrides);
sa.desktop.systemDialogs.animate (forDialog, jQuerydialog, html, css, cssOverrides, callback);
},
hide : function (forDialog, systemDialog_type, cssOverrides) {
......@@ -481,7 +440,7 @@ seductiveapps.desktop = {
sa.desktop.systemDialogs.animate (forDialog, jQuerydialog, html, css, cssOverrides);
},
animate : function (forDialog, jQueryDialog, html, css, cssOverrides) {
animate : function (forDialog, jQueryDialog, html, css, cssOverrides, callback) {
var
cssFinal = sa.m.negotiateOptions (css, cssOverrides);
......@@ -491,11 +450,11 @@ seductiveapps.desktop = {
sa.s.c.setVisible ([
{ element : '#'+jQueryDialog[0].id, visible : cssFinal.showing }
], false, function () {
sa.desktop.systemDialogs.animate_setVisibleDone (forDialog, jQueryDialog, html, css, cssOverrides);
sa.desktop.systemDialogs.animate_setVisibleDone (forDialog, jQueryDialog, html, css, cssOverrides, callback);
}, true);
},
animate_setVisibleDone : function (forDialog, jQueryDialog, html, css, cssOverrides) {
animate_setVisibleDone : function (forDialog, jQueryDialog, html, css, cssOverrides, callback) {
var
cssFinal = sa.m.negotiateOptions (css, cssOverrides),
dialogContent = jQueryDialog[0],
......@@ -540,6 +499,7 @@ seductiveapps.desktop = {
});
}
sa.desktop.systemDialogs.resize();
if (typeof callback=='function') callback(forDialog, jQueryDialog, html, css, cssOverrides);
}
});
}
......
seductiveapps/siteMedia/iconPublish.png

16.3 KB | W: | H:

seductiveapps/siteMedia/iconPublish.png

69.5 KB | W: | H:

seductiveapps/siteMedia/iconPublish.png
seductiveapps/siteMedia/iconPublish.png
seductiveapps/siteMedia/iconPublish.png
seductiveapps/siteMedia/iconPublish.png
  • 2-up
  • Swipe
  • Onion skin
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