[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Fmsystem-commits] [14607] clean up from yui
|
From: |
Sigurd Nes |
|
Subject: |
[Fmsystem-commits] [14607] clean up from yui |
|
Date: |
Wed, 16 Dec 2015 15:12:13 +0000 |
Revision: 14607
http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=14607
Author: sigurdne
Date: 2015-12-16 15:12:13 +0000 (Wed, 16 Dec 2015)
Log Message:
-----------
clean up from yui
Modified Paths:
--------------
branches/dev-syncromind/activitycalendar/templates/base/css/base.css
branches/dev-syncromind/activitycalendarfrontend/js/activitycalendarfrontend/organization_edit.js
branches/dev-syncromind/booking/inc/class.uiallocation.inc.php
branches/dev-syncromind/booking/inc/class.uimassbooking.inc.php
branches/dev-syncromind/booking/js/booking/allocation_list.js
branches/dev-syncromind/booking/js/booking/completed_reservation.js
branches/dev-syncromind/booking/templates/base/css/base.css
Removed Paths:
-------------
branches/dev-syncromind/booking/templates/base/dashboard.xsl
Modified: branches/dev-syncromind/activitycalendar/templates/base/css/base.css
===================================================================
--- branches/dev-syncromind/activitycalendar/templates/base/css/base.css
2015-12-16 14:51:11 UTC (rev 14606)
+++ branches/dev-syncromind/activitycalendar/templates/base/css/base.css
2015-12-16 15:12:13 UTC (rev 14607)
@@ -288,7 +288,6 @@
float: right;
border: none;
text-decoration: none;
- background:transparent
url(../../../../phpgwapi/js/yahoo/assets/skins/sam/sprite.png) no-repeat scroll
0 -300px;
width: 25px;
height: 15px;
cursor: pointer;
@@ -455,7 +454,3 @@
.paginator {
margin-left: 1em !important;
}
-
-th.yui-dt-sortable div{
- background:
url(../../../../phpgwapi/js/yahoo/assets/skins/sam/sprite.png) repeat-x scroll
0pt -100px rgb(216, 216, 218);
-}
Modified:
branches/dev-syncromind/activitycalendarfrontend/js/activitycalendarfrontend/organization_edit.js
===================================================================
---
branches/dev-syncromind/activitycalendarfrontend/js/activitycalendarfrontend/organization_edit.js
2015-12-16 14:51:11 UTC (rev 14606)
+++
branches/dev-syncromind/activitycalendarfrontend/js/activitycalendarfrontend/organization_edit.js
2015-12-16 15:12:13 UTC (rev 14607)
@@ -1,31 +1,12 @@
var current_address = "";
function get_address_search()
{
-// var address = document.getElementById('address').value;
-// var div_address = document.getElementById('address_container');
-// div_address.style.display="block";
-
var address = $('#address').val();
var div_address = $('#address_container');
- //url =
"/aktivby/registreringsskjema/ny/index.php?menuaction=activitycalendarfrontend.uiactivity.get_address_search&phpgw_return_as=json&search="
+ address;
-// url = "<?php echo $ajaxURL
?>index.php?menuaction=activitycalendarfrontend.uiactivity.get_address_search&phpgw_return_as=json&search="
+ address;
-//
-// var divcontent_start = "<select name=\"address_select\"
id=\"address_select\" size=\"5\" onChange='setAddressValue(this)'>";
-// var divcontent_end = "</select>";
-
var url = phpGWLink('activitycalendarfrontend/', {menuaction:
'activitycalendarfrontend.uiactivity.get_address_search', search: address},
true);
var attr = [{name: 'name', value: 'address_select'}, {name: 'id',
value: 'address_select'}, {name: 'size', value: '5'}, {name: 'onChange', value:
'setAddressValue(this)'}];
-// var callback = {
-// success: function(response){
-// div_address.innerHTML = divcontent_start +
JSON.parse(response.responseText) + divcontent_end;
-// },
-// failure: function(o) {
-// alert("AJAX doesn't work"); //FAILURE
-// }
-// }
-// var trans = YAHOO.util.Connect.asyncRequest('GET', url, callback, null);
div_address.hide();
Modified: branches/dev-syncromind/booking/inc/class.uiallocation.inc.php
===================================================================
--- branches/dev-syncromind/booking/inc/class.uiallocation.inc.php
2015-12-16 14:51:11 UTC (rev 14606)
+++ branches/dev-syncromind/booking/inc/class.uiallocation.inc.php
2015-12-16 15:12:13 UTC (rev 14607)
@@ -72,19 +72,6 @@
'text' =>
lang('Organization') . ':',
'list' =>
$this->bo->so->get_organizations(),
),
-# array('type' =>
'filter',
-# 'name' =>
'buildings',
-# 'text' => lang('Building').':',
-# 'list' => $this->bo->so->get_buildings(),
-# 'onItemSelect'
=> 'updateBuildingFilter',
-#
'onClearSelection' => 'clearBuildingFilter'
-# ),
-# array('type' =>
'filter',
-# 'name' =>
'seasons',
-# 'text' => lang('Season').':',
-# 'list' =>
$this->bo->so->get_seasons($build_id),
-#
'requestGenerator' => 'requestWithBuildingFilter',
-# ),
array(
'type' =>
'link',
'value' =>
$_SESSION['showall'] ? lang('Show only active') : lang('Show all'),
Modified: branches/dev-syncromind/booking/inc/class.uimassbooking.inc.php
===================================================================
--- branches/dev-syncromind/booking/inc/class.uimassbooking.inc.php
2015-12-16 14:51:11 UTC (rev 14606)
+++ branches/dev-syncromind/booking/inc/class.uimassbooking.inc.php
2015-12-16 15:12:13 UTC (rev 14607)
@@ -136,6 +136,6 @@
self::add_javascript('booking', 'booking',
'schedule.js');
phpgwapi_jquery::load_widget("datepicker");
- self::render_template('massbooking_schedule',
array('building' => $building, 'backend' => $backend));
+ self::render_template_xsl('massbooking_schedule',
array('building' => $building, 'backend' => $backend));
}
}
\ No newline at end of file
Modified: branches/dev-syncromind/booking/js/booking/allocation_list.js
===================================================================
--- branches/dev-syncromind/booking/js/booking/allocation_list.js
2015-12-16 14:51:11 UTC (rev 14606)
+++ branches/dev-syncromind/booking/js/booking/allocation_list.js
2015-12-16 15:12:13 UTC (rev 14607)
@@ -1,8 +1,8 @@
var seasonFilterBuildingId = false;
function updateBuildingFilter(sType, aArgs) {
- YAHOO.util.Dom.get("filter_season_name").value = "";
- YAHOO.util.Dom.get("filter_season_id").value = "";
+ $('#filter_season_name').val('');
+ $('#filter_season_id').val('');
seasonFilterBuildingId = aArgs[2].id;
}
Modified: branches/dev-syncromind/booking/js/booking/completed_reservation.js
===================================================================
--- branches/dev-syncromind/booking/js/booking/completed_reservation.js
2015-12-16 14:51:11 UTC (rev 14606)
+++ branches/dev-syncromind/booking/js/booking/completed_reservation.js
2015-12-16 15:12:13 UTC (rev 14607)
@@ -1,8 +1,8 @@
var seasonFilterBuildingId = false;
function updateBuildingFilter(sType, aArgs) {
- YAHOO.util.Dom.get("filter_season_name").value = "";
- YAHOO.util.Dom.get("filter_season_id").value = "";
+ $('#filter_season_name').val('');
+ $('#filter_season_id').val('');
seasonFilterBuildingId = aArgs[2].id;
}
Modified: branches/dev-syncromind/booking/templates/base/css/base.css
===================================================================
--- branches/dev-syncromind/booking/templates/base/css/base.css 2015-12-16
14:51:11 UTC (rev 14606)
+++ branches/dev-syncromind/booking/templates/base/css/base.css 2015-12-16
15:12:13 UTC (rev 14607)
@@ -259,7 +259,6 @@
float: right;
border: none;
text-decoration: none;
- background:transparent
url(../../../../phpgwapi/js/yahoo/assets/skins/sam/sprite.png) no-repeat scroll
0 -300px;
width: 25px;
height: 15px;
cursor: pointer;
Deleted: branches/dev-syncromind/booking/templates/base/dashboard.xsl
===================================================================
--- branches/dev-syncromind/booking/templates/base/dashboard.xsl
2015-12-16 14:51:11 UTC (rev 14606)
+++ branches/dev-syncromind/booking/templates/base/dashboard.xsl
2015-12-16 15:12:13 UTC (rev 14607)
@@ -1,26 +0,0 @@
-<xsl:template match="data" xmlns:php="http://php.net/xsl";>
- <xsl:call-template name="yui_booking_i18n"/>
- <div id="content">
- <h3>
- <xsl:value-of select="php:function('lang', 'Active
applications')" />
- </h3>
-
- <div id="apps_container"/>
-
- </div>
- <script type="text/javascript">
- var lang = <xsl:value-of select="php:function('js_lang', 'ID',
'Type', 'Status', 'Modified', 'Created')"/>;
- <![CDATA[
- YAHOO.util.Event.addListener(window, "load", function() {
- var url =
'index.php?menuaction=booking.uiapplication.index&phpgw_return_as=json&sort=modified&';
- var colDefs = [{key: 'id', label: lang['ID'], formatter:
YAHOO.booking.formatLink, sortable: true},
- {key: 'type', label:
lang['Type'], sortable: true},
- {key: 'status', label:
lang['Status'], sortable: true},
- {key: 'modified', label:
lang['Modified'], sortable: true},
- {key: 'created', label:
lang['Created'], sortable: true}
- ];
- YAHOO.booking.inlineTableHelper('apps_container', url,
colDefs);
- });
- ]]>
- </script>
-</xsl:template>
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Fmsystem-commits] [14607] clean up from yui,
Sigurd Nes <=