admin/Facilitor
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

FSN#29228 Mobile portal plaatjes

Browse Source 
svn path=/Website/trunk/; revision=21477
This commit is contained in:
Peter Feij
2014-05-01 15:01:18 +00:00
parent 751d182e97
commit eb6262a7ee
3 changed files with 9 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
APPL/PDA/Facilitor.asp
View File

@@ -51,7 +51,8 @@ function generateMenu()
+ " || CASE WHEN m.ins_discipline_key IS NOT NULL THEN '&dis_key='|| m.ins_discipline_key END"
+ " || CASE WHEN m.ins_srtdiscipline_key IS NOT NULL THEN '&srtdisc='|| m.ins_srtdiscipline_key END"
+ " url"
+ " , COALESCE (fac_menu_image, fac_menuitems_image) image"
+ " , fac_menuitems_image" // evt image
+ " , fac_menu_image" // evt overrule
+ " , COALESCE (fac_menu_altgroep, fac_menuitems_groep) groep"
+ " , fac_menu_level"
+ " , " + lcl.xsqla('fac_menu_info', 'fac_menu_key')
@@ -79,22 +80,20 @@ function generateMenu()
var oRs = Oracle.Execute( lsql );
var Items = []; // In mobile kennen we (nog) geen genest menu
var isImageMenu = false;
while( !oRs.eof )
{
var mlabel = fac.localstring(oRs("label").value);
var murl = oRs("url").value;
isImageMenu = isImageMenu || oRs("image").value!= null;
Items.push({name: mlabel,
info: oRs("fac_menu_info").value,
href: murl ,
img: oRs("image").value
img: (oRs("fac_menu_image").value!= null ? safe.htmlattr(S("menu_image_path") + oRs("fac_menu_image").value) : (oRs("fac_menuitems_image").value!= null ? "../Pictures/" + oRs("fac_menuitems_image").value : null))
})
oRs.MoveNext();
}
oRs.Close();
if (isImageMenu)
if (S("mobile_imageportal"))
{ // Er is minimaal 1 plaatje bij de menuitems aanwezig, dus menu wordt een grid.
var actions = "<div class='ui-grid-b'>";
for (var i=0; i<Items.length; i++)
@@ -103,7 +102,7 @@ function generateMenu()
var mlabel = itm.name;
if (itm.href.substr(itm.href.lastIndexOf("/") + 1) == "setlocation.asp")
mlabel = CurrentPosition;
var img = "<img src='"+ (itm.img ?safe.htmlattr(S("menu_image_path") + itm.img):"../pictures/portalnoimagemob.png") +"'>";
var img = "<img class='miconimg' src='"+ (itm.img ? itm.img :"../pictures/portalnoimagemob.png") +"'>";
var colnr;
switch (i%3)
{

4
APPL/PDA/default.css
View File

@@ -46,7 +46,9 @@ label.ed {font-weight: bold; color: #0077E6;}
}
.micon {
padding: 12px 6px 12px 6px !important;
padding: 10px 6px 10px 6px !important;
xmin-height: 100px !important;
xbox-shadow: 2px 2px 2px #cccccc !important;
}
#bijlagepopup {

2
APPL/PDA/reservering_new.asp
View File

@@ -32,7 +32,7 @@ FCLTHeader.Requires({ js: ["jquery.timepicker-table.js"],
css: ["timePicker-table.css"] });
var urole = "fe";
var rsv_ruimte_key = getQParamInt("rsv_ruimte_key");
var rsv_ruimte_key = getQParamInt("rsv_ruimte_key", -1);
var date_from = getQParamDate("date_from", null);
var date_to = getQParamDate("date_to", null);
var act_key = getQParamInt("act_key", -1);