[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Fmsystem-commits] [9395]
|
From: |
Torstein |
|
Subject: |
[Fmsystem-commits] [9395] |
|
Date: |
Mon, 14 May 2012 11:44:38 +0000 |
Revision: 9395
http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=9395
Author: vator
Date: 2012-05-14 11:44:38 +0000 (Mon, 14 May 2012)
Log Message:
-----------
Modified Paths:
--------------
trunk/controller/inc/class.uicontrol_location.inc.php
trunk/controller/templates/base/calendar/view_calendar_month.xsl
trunk/controller/templates/base/calendar/view_calendar_year.xsl
trunk/controller/templates/base/css/base.css
Added Paths:
-----------
trunk/controller/images/left_arrow_simple_black.png
trunk/controller/images/right_arrow_simple_black.png
trunk/controller/js/yahoo/control_tabs_rubbish.js
Removed Paths:
-------------
trunk/controller/js/yahoo/control_tabs.js
Added: trunk/controller/images/left_arrow_simple_black.png
===================================================================
(Binary files differ)
Property changes on: trunk/controller/images/left_arrow_simple_black.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/controller/images/right_arrow_simple_black.png
===================================================================
(Binary files differ)
Property changes on: trunk/controller/images/right_arrow_simple_black.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Modified: trunk/controller/inc/class.uicontrol_location.inc.php
===================================================================
--- trunk/controller/inc/class.uicontrol_location.inc.php 2012-05-14
11:09:06 UTC (rev 9394)
+++ trunk/controller/inc/class.uicontrol_location.inc.php 2012-05-14
11:44:38 UTC (rev 9395)
@@ -175,7 +175,7 @@
phpgwapi_yui::load_widget('paginator');
- self::add_javascript('controller', 'yahoo',
'control_tabs.js');
+ //self::add_javascript('controller', 'yahoo',
'control_tabs.js'); Slett hvis ikke systemet påvirkes. Mulig denne ikke har
noen funksjon
self::add_javascript('controller', 'controller',
'jquery.js');
self::add_javascript('controller', 'controller',
'ajax.js');
@@ -350,7 +350,7 @@
phpgwapi_yui::load_widget('paginator');
- self::add_javascript('controller', 'yahoo',
'control_tabs.js');
+ //self::add_javascript('controller', 'yahoo',
'control_tabs.js'); Slett hvis ikke systemet påvirkes. Mulig denne ikke har
noen funksjon
self::add_javascript('controller',
'controller', 'jquery.js');
self::add_javascript('controller',
'controller', 'ajax.js');
Deleted: trunk/controller/js/yahoo/control_tabs.js
===================================================================
--- trunk/controller/js/yahoo/control_tabs.js 2012-05-14 11:09:06 UTC (rev
9394)
+++ trunk/controller/js/yahoo/control_tabs.js 2012-05-14 11:44:38 UTC (rev
9395)
@@ -1,15 +0,0 @@
-YAHOO.util.Event.addListener(window, "load", function() {
-
- /*
- var oArgs = {menuaction:'controller.uicontrol.edit'};
- var url = phpGWLink('index.php', oArgs, true);
- var colDefs = [{key: 'name', label: lang['Name'], formatter:
YAHOO.portico.formatLink}, {key: 'category', label: lang['Category']}, {key:
'actions', label: lang['Actions'], formatter:
YAHOO.portico.formatGenericLink(lang['Edit'], lang['Delete'])}];
- YAHOO.portico.inlineTableHelper('details_container', url, colDefs);
-
-
- var oArgs =
{menuaction:'booking.uipermission_resource.index',sort:'name',filter_object_id:resource_id};
- var url = phpGWLink('index.php', oArgs, true);
- var colDefs = [{key: 'subject_name', label: lang['Account']}, {key:
'role', label: lang['Role']}, {key: 'actions', label: lang['Actions'],
formatter: YAHOO.portico.formatGenericLink(lang['Edit'], lang['Delete'])}];
- YAHOO.portico.inlineTableHelper('permissions_container', url,
colDefs);*/
-});
-
Copied: trunk/controller/js/yahoo/control_tabs_rubbish.js (from rev 9172,
trunk/controller/js/yahoo/control_tabs.js)
===================================================================
--- trunk/controller/js/yahoo/control_tabs_rubbish.js
(rev 0)
+++ trunk/controller/js/yahoo/control_tabs_rubbish.js 2012-05-14 11:44:38 UTC
(rev 9395)
@@ -0,0 +1,15 @@
+YAHOO.util.Event.addListener(window, "load", function() {
+
+ /*
+ var oArgs = {menuaction:'controller.uicontrol.edit'};
+ var url = phpGWLink('index.php', oArgs, true);
+ var colDefs = [{key: 'name', label: lang['Name'], formatter:
YAHOO.portico.formatLink}, {key: 'category', label: lang['Category']}, {key:
'actions', label: lang['Actions'], formatter:
YAHOO.portico.formatGenericLink(lang['Edit'], lang['Delete'])}];
+ YAHOO.portico.inlineTableHelper('details_container', url, colDefs);
+
+
+ var oArgs =
{menuaction:'booking.uipermission_resource.index',sort:'name',filter_object_id:resource_id};
+ var url = phpGWLink('index.php', oArgs, true);
+ var colDefs = [{key: 'subject_name', label: lang['Account']}, {key:
'role', label: lang['Role']}, {key: 'actions', label: lang['Actions'],
formatter: YAHOO.portico.formatGenericLink(lang['Edit'], lang['Delete'])}];
+ YAHOO.portico.inlineTableHelper('permissions_container', url,
colDefs);*/
+});
+
Property changes on: trunk/controller/js/yahoo/control_tabs_rubbish.js
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Modified: trunk/controller/templates/base/calendar/view_calendar_month.xsl
===================================================================
--- trunk/controller/templates/base/calendar/view_calendar_month.xsl
2012-05-14 11:09:06 UTC (rev 9394)
+++ trunk/controller/templates/base/calendar/view_calendar_month.xsl
2012-05-14 11:44:38 UTC (rev 9395)
@@ -41,7 +41,7 @@
<xsl:text>&location_code=</xsl:text>
<xsl:value-of
select="//current_location/location_code"/>
</xsl:attribute>
- <img height="17"
src="controller/images/left_arrow.png" />
+ <img height="17"
src="controller/images/left_arrow_simple_black.png" />
<xsl:variable
name="month_str">month <xsl:value-of select="current_month_nr - 1"/>
capitalized</xsl:variable>
<xsl:value-of
select="php:function('lang', $month_str)" />
</a>
@@ -56,7 +56,7 @@
<xsl:text>&location_code=</xsl:text>
<xsl:value-of
select="//current_location/location_code"/>
</xsl:attribute>
- <img height="17"
src="controller/images/left_arrow.png" />
+ <img height="17"
src="controller/images/left_arrow_simple_black.png" />
<xsl:variable
name="month_str">month 12 capitalized</xsl:variable>
<xsl:value-of
select="php:function('lang', $month_str)" />
</a>
@@ -81,7 +81,7 @@
</xsl:attribute>
<xsl:variable
name="month_str">month <xsl:value-of select="current_month_nr + 1"/>
capitalized</xsl:variable>
<xsl:value-of
select="php:function('lang', $month_str)" />
- <img height="17"
src="controller/images/right_arrow.png" />
+ <img height="17"
src="controller/images/right_arrow_simple_black.png" />
</a>
</xsl:when>
<xsl:otherwise>
@@ -96,7 +96,7 @@
</xsl:attribute>
<xsl:variable
name="month_str">month 1 capitalized</xsl:variable>
<xsl:value-of
select="php:function('lang', $month_str)" />
- <img height="17"
src="controller/images/right_arrow.png" />
+ <img height="17"
src="controller/images/right_arrow_simple_black.png" />
</a>
</xsl:otherwise>
</xsl:choose>
Modified: trunk/controller/templates/base/calendar/view_calendar_year.xsl
===================================================================
--- trunk/controller/templates/base/calendar/view_calendar_year.xsl
2012-05-14 11:09:06 UTC (rev 9394)
+++ trunk/controller/templates/base/calendar/view_calendar_year.xsl
2012-05-14 11:44:38 UTC (rev 9395)
@@ -27,8 +27,12 @@
<xsl:text>&location_code=</xsl:text>
<xsl:value-of
select="current_location/location_code"/>
</xsl:attribute>
+ <img height="17"
src="controller/images/left_arrow_simple_black.png" />
<xsl:value-of select="current_year -
1"/>
</a>
+ <span class="current">
+ <xsl:value-of
select="current_year"/>
+ </span>
<a class="showNext">
<xsl:attribute name="href">
<xsl:text>index.php?menuaction=controller.uicalendar.view_calendar_for_year</xsl:text>
@@ -38,6 +42,7 @@
<xsl:value-of
select="current_location/location_code"/>
</xsl:attribute>
<xsl:value-of select="current_year +
1"/>
+ <img height="17"
src="controller/images/right_arrow_simple_black.png" />
</a>
</div>
Modified: trunk/controller/templates/base/css/base.css
===================================================================
--- trunk/controller/templates/base/css/base.css 2012-05-14 11:09:06 UTC
(rev 9394)
+++ trunk/controller/templates/base/css/base.css 2012-05-14 11:44:38 UTC
(rev 9395)
@@ -402,7 +402,7 @@
}
input[type="submit"] {
background: none repeat scroll 0 0 #4F9AEA;
- border: 0 none;
+ border: 1px solid #4685C8;
border-radius: 4px 4px 4px 4px;
color: #FFFFFF;
cursor: pointer;
@@ -1029,7 +1029,6 @@
#calNav a.showPrev {
display: block;
float: left;
- margin-left: 547px;
padding-left: 3px;
padding-top: 5px;
vertical-align: sub;
@@ -1037,14 +1036,11 @@
#calNav a.showPrev img{
margin-right:5px;
}
-#calNav a.showPrev.month {
- margin-left: 437px;
-}
#calNav .current {
display: block;
float: left;
font-size: 21px;
- padding-left: 200px;
+ padding-left: 500px;
}
/* ====================== CALENDAR INFO BOX ========================== */
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Fmsystem-commits] [9395],
Torstein <=