15 csets were pushed to core/ap2block: Merge xaraya.com:/var/bk/xar/core/ap2blo...

Changes were applied by marcel to core/ap2block level 15.
    The following csets were applied:
    
    ChangeSet
      1.2194 05/02/16 19:05:12 [email protected] +3 -0
      Small corrections, further removal of things not used.
    
      html/modules/adminpanels/xartemplates/blocks/modify-adminmenu.xd
        1.6 05/02/16 19:05:10 [email protected] +3 -3
        Corrected a copy/paste remnant.
    
      html/modules/adminpanels/xarblocks/adminmenu.php
        1.102 05/02/16 19:05:10 [email protected] +3 -49
        - added a FIXME
        - removed the unused $menustyle variable
        - removed the unused menustyle switch branches
    
      html/modules/adminpanels/xaradminapi/buildmenu.php
        1.17 05/02/16 19:05:10 [email protected] +1 -0
        add a note
    
    ChangeSet
      1.2193 05/02/16 17:04:54 [email protected] +3 -0
      Housecleaning
    
      html/modules/adminpanels/xaradminapi/getmenulinks.php
        1.4 05/02/16 17:04:52 [email protected] +1 -24
        remove some old stuff, return an array always, why was this? <shrug/>
    
      html/modules/adminpanels/xaradminapi/create.php
        1.6 05/02/16 17:04:52 [email protected] +1 -1
        inserting a question
    
      html/modules/adminpanels/xaradmin/loadnewmod.php
        1.7 05/02/16 17:04:52 [email protected] +1 -2
        inserting a question
    
    ChangeSet
      1.2192 05/02/16 16:53:55 [email protected] +6 -0
      I have been told the marker stuff is a styling issue, css can take care of it then.
    
      html/modules/adminpanels/xartemplates/blocks/modify-adminmenu.xd
        1.5 05/02/16 16:53:53 [email protected] +0 -13
        I have been told the marker stuff is a styling issue, css can take care of it then.
    
      html/modules/adminpanels/xartemplates/admin-modifyconfig.xd
        1.47 05/02/16 16:53:53 [email protected] +2 -26
        I have been told the marker stuff is a styling issue, css can take care of it then.
    
      html/modules/adminpanels/xarblocks/modify-adminmenu.php
        1.5 05/02/16 16:53:53 [email protected] +0 -2
        I have been told the marker stuff is a styling issue, css can take care of it then.
    
      html/modules/adminpanels/xarblocks/adminmenu.php
        1.101 05/02/16 16:53:53 [email protected] +1 -10
        I have been told the marker stuff is a styling issue, css can take care of it then.
    
      html/modules/adminpanels/xaradmin/updateconfig.php
        1.22 05/02/16 16:53:53 [email protected] +0 -3
        I have been told the marker stuff is a styling issue, css can take care of it then.
    
      html/modules/adminpanels/xaradmin/modifyconfig.php
        1.12 05/02/16 16:53:53 [email protected] +0 -3
        I have been told the marker stuff is a styling issue, css can take care of it then.
    
    ChangeSet
      1.2191 05/02/16 16:28:27 [email protected] +2 -0
      Simplify the modify config.
    
      html/modules/adminpanels/xartemplates/admin-modifyconfig.xd
        1.46 05/02/16 16:28:25 [email protected] +6 -27
        Make the changes into one form.
    
      html/modules/adminpanels/xaradmin/updateconfig.php
        1.21 05/02/16 16:28:25 [email protected] +15 -25
        - check authcode first, before doing anything else
        - lets not make it more complicated than it needs to be
    
    ChangeSet
      1.2190 05/02/16 16:15:17 [email protected] +5 -0
      Changes related to allowing menustyle per block instance
    
      html/modules/adminpanels/xartemplates/blocks/modify-adminmenu.xd
        1.4 05/02/16 16:15:15 [email protected] +22 -1
        Add the new config param to the block config screen
    
      html/modules/adminpanels/xartemplates/admin-modifyconfig.xd
        1.45 05/02/16 16:15:15 [email protected] +2 -5
        Change the text according to the change
    
      html/modules/adminpanels/xarblocks/modify-adminmenu.php
        1.4 05/02/16 16:15:15 [email protected] +7 -0
        add the menustyle parameter to the block instance configuration, revert to mod default when not found
    
      html/modules/adminpanels/xarblocks/adminmenu.php
        1.100 05/02/16 16:15:15 [email protected] +13 -18
        Add menustyle parameter to block instance configuration, but leave the modvar, so it can be configured as default and helps migrating 
        from older installs.
    
      html/modules/adminpanels/xaradmin/updateconfig.php
        1.20 05/02/16 16:15:15 [email protected] +0 -10
        clean the showmarker from the mod config
    
    ChangeSet
      1.2189 05/02/16 15:44:28 [email protected] +1 -0
      use the same template as the rest of the block page
    
      html/modules/adminpanels/xartemplates/blocks/modify-adminmenu.xd
        1.3 05/02/16 15:44:26 [email protected] +22 -25
        use the same template as the rest of the block page
    
    ChangeSet
      1.2188 05/02/16 15:29:24 [email protected] +5 -0
      Showmarker to block instance config
    
      html/modules/adminpanels/xartemplates/blocks/modify-adminmenu.xd
        1.2 05/02/16 15:29:22 [email protected] +14 -0
        Showmarker to block instance config
    
      html/modules/adminpanels/xartemplates/admin-modifyconfig.xd
        1.44 05/02/16 15:29:22 [email protected] +1 -10
        Showmarker to block instance config
    
      html/modules/adminpanels/xarblocks/modify-adminmenu.php
        1.3 05/02/16 15:29:22 [email protected] +6 -3
        Showmarker to block instance config
    
      html/modules/adminpanels/xarblocks/adminmenu.php
        1.99 05/02/16 15:29:22 [email protected] +15 -18
        Showmarker to block instance config
    
      html/modules/adminpanels/xaradmin/modifyconfig.php
        1.11 05/02/16 15:29:22 [email protected] +0 -1
        Showmarker to block instance config
    
    ChangeSet
      1.2187 05/02/16 14:46:56 [email protected] +9 -0
      Cleaning out some remnant of my blunt copy and paste action.
    
      html/modules/adminpanels/xarblocks/modify-adminmenu.php
        1.2 05/02/16 14:46:54 [email protected] +0 -6
        Cleaning
    
      html/modules/adminpanels/xaradmin/updateconfig.php
        1.19 05/02/16 14:46:54 [email protected] +0 -11
        Cleaning
    
      html/modules/adminpanels/xaradmin/modifyconfig.php
        1.10 05/02/16 14:46:54 [email protected] +0 -2
        Cleaning
    
      html/modules/adminpanels/xaradmin/main.php
        1.6 05/02/16 14:46:54 [email protected] +0 -2
        Cleaning
    
      html/modules/adminpanels/xaradmin/loadnewmod.php
        1.6 05/02/16 14:46:54 [email protected] +0 -2
        Cleaning
    
      html/modules/adminpanels/xaradmin/confirmlogout.php
        1.10 05/02/16 14:46:54 [email protected] +0 -2
        Cleaning
    
      html/modules/adminpanels/xaradmin/config_modgroups.php
        1.5 05/02/16 14:46:54 [email protected] +0 -2
        Cleaning
    
      html/modules/adminpanels/xaradmin/config_byweight.php
        1.5 05/02/16 14:46:54 [email protected] +0 -2
        Cleaning
    
      html/modules/adminpanels/xaradmin/config_bygroup.php
        1.5 05/02/16 14:46:54 [email protected] +0 -2
        Cleaning
    
    ChangeSet
      1.2186 05/02/16 14:33:11 [email protected] +2 -0
      Simplifying the logout confirmation.
    
      html/modules/adminpanels/xartemplates/admin-confirmlogout.xd
        1.13 05/02/16 14:33:09 [email protected] +6 -1
        No need for coding the link, moving hardcoded javascript out of the code.
    
      html/modules/adminpanels/xaradmin/confirmlogout.php
        1.9 05/02/16 14:33:09 [email protected] +2 -15
        Let the template do the work
    
    ChangeSet
      1.2185 05/02/16 14:22:32 [email protected] +2 -0
      Moving cancel label to the template space, no need to code it up.
    
      html/modules/adminpanels/xartemplates/admin-confirmlogout.xd
        1.12 05/02/16 14:22:30 [email protected] +2 -1
        Moving out cancel label
    
      html/modules/adminpanels/xaradmin/confirmlogout.php
        1.8 05/02/16 14:22:30 [email protected] +1 -3
        Moving out cancel label.
    
    ChangeSet
      1.2184 05/02/16 14:18:28 [email protected] +6 -0
      Moving out logout url to the template space, no need to code it up.
    
      html/modules/adminpanels/xartemplates/blocks/verticallistbyname.xd
        1.10 05/02/16 14:18:26 [email protected] +1 -1
        Moving out logout url
    
      html/modules/adminpanels/xartemplates/blocks/verticallistbycats.xd
        1.13 05/02/16 14:18:26 [email protected] +1 -1
        Moving out logout url
    
      html/modules/adminpanels/xartemplates/blocks/sidemenu.xd
        1.26 05/02/16 14:18:26 [email protected] +1 -1
        Moving out logout url
    
      html/modules/adminpanels/xartemplates/admin-confirmlogout.xd
        1.11 05/02/16 14:18:26 [email protected] +1 -1
        Moving out logout url
    
      html/modules/adminpanels/xarblocks/adminmenu.php
        1.98 05/02/16 14:18:26 [email protected] +0 -6
        Moving out logout url
    
      html/modules/adminpanels/xaradmin/confirmlogout.php
        1.7 05/02/16 14:18:26 [email protected] +0 -1
        Moving out logout url
    
    ChangeSet
      1.2183 05/02/16 14:11:56 [email protected] +6 -0
      Move the logout label to the template domain. No need to code it up.
    
      html/modules/adminpanels/xartemplates/blocks/verticallistbyname.xd
        1.9 05/02/16 14:11:54 [email protected] +3 -1
        - moving out logout label
    
      html/modules/adminpanels/xartemplates/blocks/verticallistbycats.xd
        1.12 05/02/16 14:11:54 [email protected] +3 -1
        - moving out logout label
    
      html/modules/adminpanels/xartemplates/blocks/sidemenu.xd
        1.25 05/02/16 14:11:54 [email protected] +1 -1
        moving out logoutlabel
    
      html/modules/adminpanels/xartemplates/admin-confirmlogout.xd
        1.10 05/02/16 14:11:54 [email protected] +1 -1
        - moving out logoutlabel
    
      html/modules/adminpanels/xarblocks/adminmenu.php
        1.97 05/02/16 14:11:54 [email protected] +9 -10
        - some comments
        - moving out logoutlabel
    
      html/modules/adminpanels/xaradmin/confirmlogout.php
        1.6 05/02/16 14:11:54 [email protected] +0 -1
        Moving out logoutlabel
    
    ChangeSet
      1.2182 05/02/16 13:48:10 [email protected] +5 -0
      Moving the 'show logout' setting to a block setting per instance.
    
      html/modules/adminpanels/xartemplates/blocks/verticallistbyname.xd
        1.8 05/02/16 13:48:08 [email protected] +1 -1
        adjust for the block parameter instead of the module parameter
    
      html/modules/adminpanels/xartemplates/blocks/verticallistbycats.xd
        1.11 05/02/16 13:48:08 [email protected] +1 -1
        adjust for the block parameter instead of the module parameter
    
      html/modules/adminpanels/xartemplates/admin-modifyconfig.xd
        1.43 05/02/16 13:48:08 [email protected] +1 -10
        Inform the user that the setting can now be adjusted in the block instance
    
      html/modules/adminpanels/xarblocks/adminmenu.php
        1.96 05/02/16 13:48:08 [email protected] +15 -1
        adjustments for making the 'show logout' setting a per instance setting
    
      html/modules/adminpanels/xaradmin/modifyconfig.php
        1.9 05/02/16 13:48:08 [email protected] +0 -2
        moving the show logout setting to a per instance setting
    
    ChangeSet
      1.2181 05/02/16 13:23:57 [email protected] +3 -0
      Preparation cset for moving some setting from global adminpanels level to block instance level. 
    
      html/modules/adminpanels/xartemplates/blocks/modify-adminmenu.xd
        1.1 05/02/16 13:23:55 [email protected] +15 -0
    
      html/modules/adminpanels/xarblocks/modify-adminmenu.php
        1.1 05/02/16 13:23:55 [email protected] +55 -0
    
      html/modules/roles/xarblocks/login.php
        1.51 05/02/16 13:23:55 [email protected] +1 -0
        adding a FIXME
    
      html/modules/adminpanels/xartemplates/blocks/modify-adminmenu.xd
        1.0 05/02/16 13:23:55 [email protected] +0 -0
        BitKeeper file /var/bk/xar/core/xartest/html/modules/adminpanels/xartemplates/blocks/modify-adminmenu.xd
    
      html/modules/adminpanels/xarblocks/modify-adminmenu.php
        1.0 05/02/16 13:23:55 [email protected] +0 -0
        BitKeeper file /var/bk/xar/core/xartest/html/modules/adminpanels/xarblocks/modify-adminmenu.php
    
Links for the differences:
http://xaraya.com:15000/core/ap2block/[email protected]
http://xaraya.com:15000/core/ap2block/[email protected]
http://xaraya.com:15000/core/ap2block/[email protected]
http://xaraya.com:15000/core/ap2block/[email protected]
http://xaraya.com:15000/core/ap2block/[email protected]
http://xaraya.com:15000/core/ap2block/[email protected]
http://xaraya.com:15000/core/ap2block/[email protected]
http://xaraya.com:15000/core/ap2block/[email protected]
http://xaraya.com:15000/core/ap2block/[email protected]
http://xaraya.com:15000/core/ap2block/[email protected]
http://xaraya.com:15000/core/ap2block/[email protected]
http://xaraya.com:15000/core/ap2block/[email protected]
http://xaraya.com:15000/core/ap2block/[email protected]
http://xaraya.com:15000/core/ap2block/[email protected]