[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Fmsystem-commits] [7391]
|
From: |
Erik Holm-Larsen |
|
Subject: |
[Fmsystem-commits] [7391] |
|
Date: |
Fri, 17 Jun 2011 05:46:14 +0000 |
Revision: 7391
http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=7391
Author: erikhl
Date: 2011-06-17 05:46:13 +0000 (Fri, 17 Jun 2011)
Log Message:
-----------
Modified Paths:
--------------
trunk/activitycalendarfrontend/inc/class.uiactivity.inc.php
trunk/activitycalendarfrontend/setup/phpgw_no.lang
trunk/activitycalendarfrontend/templates/base/activity.php
Added Paths:
-----------
trunk/activitycalendarfrontend/templates/base/css/
trunk/activitycalendarfrontend/templates/base/css/base.css
Removed Paths:
-------------
trunk/activitycalendarfrontend/templates/base/base.css
Modified: trunk/activitycalendarfrontend/inc/class.uiactivity.inc.php
===================================================================
--- trunk/activitycalendarfrontend/inc/class.uiactivity.inc.php 2011-06-16
13:17:27 UTC (rev 7390)
+++ trunk/activitycalendarfrontend/inc/class.uiactivity.inc.php 2011-06-17
05:46:13 UTC (rev 7391)
@@ -1,6 +1,7 @@
<?php
phpgw::import_class('activitycalendar.uiactivities');
phpgw::import_class('activitycalendar.soactivity');
+ phpgw::import_class('activitycalendar.sogroup');
include_class('activitycalendar', 'activity', 'inc/model/');
@@ -11,7 +12,8 @@
'add' => true,
'edit' => true,
'view' => true,
- 'index' => true
+ 'index' => true,
+ 'get_organization_groups' => true
);
/**
@@ -122,7 +124,15 @@
$district_array =
phpgw::get_var('district');
$activity->set_district(implode(",",
$district_array));
$activity->set_office(phpgw::get_var('office'));
- $activity->set_state($new_state);
+ if($action == 'new_activity')
+ {
+ $activity->set_state(1);
+ //$new_state=1;
+ }
+ else
+ {
+
$activity->set_state($new_state);
+ }
$activity->set_category(phpgw::get_var('category'));
$target_array =
phpgw::get_var('target');
$activity->set_target(implode(",",
$target_array));
@@ -182,4 +192,41 @@
$GLOBALS['phpgw']->redirect_link('/index.php',
array('menuaction' => 'activitycalendarfrontend.uiactivity.add'));
//var_dump("inni index");
}
+
+ public function get_organization_groups()
+ {
+ $GLOBALS['phpgw_info']['flags']['noheader'] = true;
+ $GLOBALS['phpgw_info']['flags']['nofooter'] = true;
+ $GLOBALS['phpgw_info']['flags']['xslt_app'] = false;
+
+ $org_id = phpgw::get_var('orgid');
+ $group_id = phpgw::get_var('groupid');
+ $returnHTML = "<option value='0'>Ingen gruppe
valgt</option>";
+ if($org_id)
+ {
+ $groups =
activitycalendar_sogroup::get_instance()->get(null, null, null, null, null,
null, array('org_id' => $org_id));
+ foreach ($groups as $group) {
+ if(isset($group))
+ {
+ //$res_g = $group->serialize();
+ $selected = "";
+ if($group_id && $group_id > 0)
+ {
+ $gr_id =
(int)$group_id;
+ if($gr_id ==
(int)$group->get_id())
+ {
+ $selected_group
= " selected";
+ }
+ }
+ $group_html[] = "<option
value='" . $group->get_id() . "'". $selected_group . ">" . $group->get_name() .
"</option>";
+ }
+ }
+ $html = implode(' ' , $group_html);
+ $returnHTML = $returnHTML . ' ' . $html;
+ }
+
+
+ return $returnHTML;
+ //return "<option>Ingen gruppe valgt</option>";
+ }
}
Modified: trunk/activitycalendarfrontend/setup/phpgw_no.lang
===================================================================
--- trunk/activitycalendarfrontend/setup/phpgw_no.lang 2011-06-16 13:17:27 UTC
(rev 7390)
+++ trunk/activitycalendarfrontend/setup/phpgw_no.lang 2011-06-17 05:46:13 UTC
(rev 7391)
@@ -44,6 +44,12 @@
state_3 activitycalendarfrontend no Akseptert
state_4 activitycalendarfrontend no Behandlet
state_5 activitycalendarfrontend no Avvist
+new activitycalendarfrontend no Ny
+accepted activitycalendarfrontend no Akseptert
+rejected activitycalendarfrontend no Avvist
+activity activitycalendarfrontend no Aktivitet
+organization activitycalendarfrontend no Organisasjon
+group activitycalendarfrontend no Gruppe
district activitycalendarfrontend no Bydel
title activitycalendarfrontend no Tittel
activity_helptext activitycalendarfrontend no Før ny
aktivitet kan registreres må du sjekke at organisasjon/gruppe finnes og er
oppdatert, og at arena finnes og er oppdatert.
\ No newline at end of file
Modified: trunk/activitycalendarfrontend/templates/base/activity.php
===================================================================
--- trunk/activitycalendarfrontend/templates/base/activity.php 2011-06-16
13:17:27 UTC (rev 7390)
+++ trunk/activitycalendarfrontend/templates/base/activity.php 2011-06-17
05:46:13 UTC (rev 7391)
@@ -5,9 +5,43 @@
$contpers_so = activitycalendar_socontactperson::get_instance();
?>
+<script src="phpgwapi/js/yui3/json/json-min.js" charset="utf-8"></script>
+<script type="text/javascript">
+
+function get_available_groups()
+{
+ var org_id = document.getElementById('organization_id').value;
+ var group_select = document.getElementById('group_id');
+ //alert(group_select);
+<?php if($activity->get_group_id()){?>
+ url =
"index.php?menuaction=activitycalendarfrontend.uiactivity.get_organization_groups&phpgw_return_as=json&orgid="
+ org_id + "&groupid=" + <?php echo $activity->get_group_id();?>;
+<?php }else{?>
+ url =
"index.php?menuaction=activitycalendarfrontend.uiactivity.get_organization_groups&phpgw_return_as=json&orgid="
+ org_id;
+<?php }?>
+
+ var callback = {
+ success: function(response){
+ //alert("det funker");
+ group_select.innerHTML =
JSON.parse(response.responseText);
+ },
+ failure: function(o) {
+ alert("AJAX doesn't work"); //FAILURE
+ }
+ }
+ var trans = YAHOO.util.Connect.asyncRequest('GET', url, callback, null);
+
+}
+
+YAHOO.util.Event.onDOMReady(function()
+{
+ get_available_groups();
+});
+
+</script>
+
<div class="yui-content">
<div id="details">
- <h1><img src="<?php echo ACTIVITYCALENDAR_IMAGE_PATH
?>images/32x32/custom/contact.png" /><?php echo lang('activity') ?></h1>
+ <h1><?php echo lang('activity') ?></h1>
<h4><?php if($editable){echo lang('activity_helptext');}?></h4>
<form action="#" method="post">
<input type="hidden" name="id" value="<?php
if($activity->get_id()){ echo $activity->get_id(); } else { echo '0'; } ?>"/>
Deleted: trunk/activitycalendarfrontend/templates/base/base.css
===================================================================
--- trunk/activitycalendarfrontend/templates/base/base.css 2011-06-16
13:17:27 UTC (rev 7390)
+++ trunk/activitycalendarfrontend/templates/base/base.css 2011-06-17
05:46:13 UTC (rev 7391)
@@ -1,243 +0,0 @@
address@hidden "UTF-8";
-
-dl.proplist,
-dl.proplist-col {
- margin: 1em 0;
- padding-left: 2em;
-}
-dl.proplist dt,
-dl.proplist-col dt {
- font-style: italic;
- font-weight: bolder;
- font-size: 90%;
- margin: .8em 0 .1em 0;
-}
-
-dl.proplist-col,
-dl.form-col {
- width: 18em;
- float: left;
-}
-
-
-table#header {
- margin: 2em;
-
- }
-
-div#unit_selector {
-
-}
-
-div#all_units_key_data {
- padding-left: 2em;
- }
-
-div#unit_image {
- margin-left: 2em;
- }
-
-div#unit_image img {
- height:170px;
-}
-
-div.yui-navset {
- padding-left: 2em;
- padding-right: 2em;
- }
-
-div#contract_selector {
- padding-left: 1em;
- padding-top: 1em;
- }
-
-img.list_image {
- margin-right: 5px;
- float:left;
- }
-
-a.list_image {
- float:left;
- display:inline;
- }
-
-ol.list_image {
- float: left;
- }
-
-ol.list_image li {
- padding: 1px;
-}
-
-dl#key_data {
- padding: 2px;
- }
-
-
-dl#key_data dd {
- padding-bottom: 1em;
-}
-
-table#key_data td {
- padding-right: 1em;
- padding: 5px;
- }
-
-
-.user_menu {
- list-style:none;
- height: 100%;
- padding: 2px;
- border-style: none none none solid;
- border-width: 1px;
- border-color: grey;
- padding-left: 5px;
-}
-
-.user_menu li {
- margin: 13px;
- }
-
-#area_and_price {
- list-style:none;
- height: 100%;
- padding: 2px;
- padding-left: 5px;
- float:right;
- padding:0.5em 1em 0 0;
-}
-
-#area_and_price li {
- margin: 13px;
- }
-
-#org_units {
- list-style: none;
- height: 100%;
- padding: 2px;
- padding-left: 5px;
- float:right;
- padding:0.5em 1em 0 0;
-}
-
-#org_units li {
- margin: 13px;
- }
-
-#information {
- list-style:none;
- height: 100%;
- padding: 2px;
- padding-left: 5px;
- float:right;
- padding:0.5em 1em 0 0;
-}
-
-#information li {
- margin: 13px;
- }
-
-a.header_link {
- text-decoration: none;
- float: none;
- }
-
-#logo_holder {
- border: 0 none;
- font-family:Arial,sans-serif;
-font-size:65%;
-line-height:1.166;
-position: absolute;
-padding:2em;
-}
-
-em#bold {
- font-weight: bold;
- }
-
-div#header a {
- float: none;
-}
-
-.yui-skin-sam .yui-navset .yui-nav, .yui-skin-sam .yui-navset .yui-navset-top
.yui-nav {
- border-color: #BF0005;
- border-width:0 0 2px;
- }
-
-.yui-skin-sam .yui-navset .yui-content {
- background: none repeat scroll 0 0 #F4F2ED;
-}
-
-.yui-skin-sam .yui-navset .yui-nav .selected a, .yui-skin-sam .yui-navset
.yui-nav .selected a:focus, .yui-skin-sam .yui-navset .yui-nav .selected
a:hover {
- background:url("../../../../assets/skins/sam/sprite.png") repeat-x
scroll left -1400px #2647A0;
- }
-
-div.tickets {
- margin-top: 1em;
- }
-
-em.select_header {
- font-size: larger;
- padding-top: 10px;
- }
-
-#contract_price_and_area {
- float: left;
- margin: 1em 2em 0 0;
-}
-
-#contract_price_and_area li {
- margin-bottom: 1em;
- }
-
-#contract_essentials {
- float: left;
- margin: 1em 2em 0 2em;
- }
-
-#composites {
- float: left;
- margin: 1em 2em 0 2em;
- }
-
-
-#comment {
- float: left;
- margin: 1em 2em 0 2em;
- }
-
- #contract_essentials li {
- margin-bottom: 1em;
- }
-
-#contract_parts {
- float: left;
- margin: 1em 2em 0 2em;
- }
-
-div.toolbar {
-background-color:#EEEEEE;
-border:1px solid #BBBBBB;
-float:left;
-width:100%;
-}
-
-div.toolbar_manual {
-background-color:#EEEEEE;
-border:1px solid #BBBBBB;
-float:left;
-width:100%;
-}
-
-.yui-pg-container {
- white-space: normal;
- }
-
-li.ticket_detail {
- padding: 5px;
- margin-left: 5px;
- }
-
-
-
-
Copied: trunk/activitycalendarfrontend/templates/base/css/base.css (from rev
7385, trunk/activitycalendarfrontend/templates/base/base.css)
===================================================================
--- trunk/activitycalendarfrontend/templates/base/css/base.css
(rev 0)
+++ trunk/activitycalendarfrontend/templates/base/css/base.css 2011-06-17
05:46:13 UTC (rev 7391)
@@ -0,0 +1,243 @@
address@hidden "UTF-8";
+
+dl.proplist,
+dl.proplist-col {
+ margin: 1em 0;
+ padding-left: 2em;
+}
+dl.proplist dt,
+dl.proplist-col dt {
+ font-style: italic;
+ font-weight: bolder;
+ font-size: 90%;
+ margin: .8em 0 .1em 0;
+}
+
+dl.proplist-col,
+dl.form-col {
+ width: 18em;
+ float: left;
+}
+
+
+table#header {
+ margin: 2em;
+
+ }
+
+div#unit_selector {
+
+}
+
+div#all_units_key_data {
+ padding-left: 2em;
+ }
+
+div#unit_image {
+ margin-left: 2em;
+ }
+
+div#unit_image img {
+ height:170px;
+}
+
+div.yui-navset {
+ padding-left: 2em;
+ padding-right: 2em;
+ }
+
+div#contract_selector {
+ padding-left: 1em;
+ padding-top: 1em;
+ }
+
+img.list_image {
+ margin-right: 5px;
+ float:left;
+ }
+
+a.list_image {
+ float:left;
+ display:inline;
+ }
+
+ol.list_image {
+ float: left;
+ }
+
+ol.list_image li {
+ padding: 1px;
+}
+
+dl#key_data {
+ padding: 2px;
+ }
+
+
+dl#key_data dd {
+ padding-bottom: 1em;
+}
+
+table#key_data td {
+ padding-right: 1em;
+ padding: 5px;
+ }
+
+
+.user_menu {
+ list-style:none;
+ height: 100%;
+ padding: 2px;
+ border-style: none none none solid;
+ border-width: 1px;
+ border-color: grey;
+ padding-left: 5px;
+}
+
+.user_menu li {
+ margin: 13px;
+ }
+
+#area_and_price {
+ list-style:none;
+ height: 100%;
+ padding: 2px;
+ padding-left: 5px;
+ float:right;
+ padding:0.5em 1em 0 0;
+}
+
+#area_and_price li {
+ margin: 13px;
+ }
+
+#org_units {
+ list-style: none;
+ height: 100%;
+ padding: 2px;
+ padding-left: 5px;
+ float:right;
+ padding:0.5em 1em 0 0;
+}
+
+#org_units li {
+ margin: 13px;
+ }
+
+#information {
+ list-style:none;
+ height: 100%;
+ padding: 2px;
+ padding-left: 5px;
+ float:right;
+ padding:0.5em 1em 0 0;
+}
+
+#information li {
+ margin: 13px;
+ }
+
+a.header_link {
+ text-decoration: none;
+ float: none;
+ }
+
+#logo_holder {
+ border: 0 none;
+ font-family:Arial,sans-serif;
+font-size:65%;
+line-height:1.166;
+position: absolute;
+padding:2em;
+}
+
+em#bold {
+ font-weight: bold;
+ }
+
+div#header a {
+ float: none;
+}
+
+.yui-skin-sam .yui-navset .yui-nav, .yui-skin-sam .yui-navset .yui-navset-top
.yui-nav {
+ border-color: #BF0005;
+ border-width:0 0 2px;
+ }
+
+.yui-skin-sam .yui-navset .yui-content {
+ background: none repeat scroll 0 0 #F4F2ED;
+}
+
+.yui-skin-sam .yui-navset .yui-nav .selected a, .yui-skin-sam .yui-navset
.yui-nav .selected a:focus, .yui-skin-sam .yui-navset .yui-nav .selected
a:hover {
+ background:url("../../../../assets/skins/sam/sprite.png") repeat-x
scroll left -1400px #2647A0;
+ }
+
+div.tickets {
+ margin-top: 1em;
+ }
+
+em.select_header {
+ font-size: larger;
+ padding-top: 10px;
+ }
+
+#contract_price_and_area {
+ float: left;
+ margin: 1em 2em 0 0;
+}
+
+#contract_price_and_area li {
+ margin-bottom: 1em;
+ }
+
+#contract_essentials {
+ float: left;
+ margin: 1em 2em 0 2em;
+ }
+
+#composites {
+ float: left;
+ margin: 1em 2em 0 2em;
+ }
+
+
+#comment {
+ float: left;
+ margin: 1em 2em 0 2em;
+ }
+
+ #contract_essentials li {
+ margin-bottom: 1em;
+ }
+
+#contract_parts {
+ float: left;
+ margin: 1em 2em 0 2em;
+ }
+
+div.toolbar {
+background-color:#EEEEEE;
+border:1px solid #BBBBBB;
+float:left;
+width:100%;
+}
+
+div.toolbar_manual {
+background-color:#EEEEEE;
+border:1px solid #BBBBBB;
+float:left;
+width:100%;
+}
+
+.yui-pg-container {
+ white-space: normal;
+ }
+
+li.ticket_detail {
+ padding: 5px;
+ margin-left: 5px;
+ }
+
+
+
+
Property changes on: trunk/activitycalendarfrontend/templates/base/css/base.css
___________________________________________________________________
Added: svn:mime-type
+ text/plain
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Fmsystem-commits] [7391],
Erik Holm-Larsen <=