[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Fmsystem-commits] [8882] Merge 8880:8881 from trunk
|
From: |
Sigurd Nes |
|
Subject: |
[Fmsystem-commits] [8882] Merge 8880:8881 from trunk |
|
Date: |
Wed, 15 Feb 2012 12:51:15 +0000 |
Revision: 8882
http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=8882
Author: sigurdne
Date: 2012-02-15 12:51:15 +0000 (Wed, 15 Feb 2012)
Log Message:
-----------
Merge 8880:8881 from trunk
Modified Paths:
--------------
branches/Version-1_0-branch/activitycalendarfrontend/templates/base/activity.php
branches/Version-1_0-branch/activitycalendarfrontend/templates/base/activity_edit.php
branches/Version-1_0-branch/activitycalendarfrontend/templates/base/activity_edit_step_1.php
branches/Version-1_0-branch/activitycalendarfrontend/templates/base/activity_new.php
branches/Version-1_0-branch/activitycalendarfrontend/templates/base/activity_new_step_1.php
branches/Version-1_0-branch/activitycalendarfrontend/templates/base/organization_edit.php
branches/Version-1_0-branch/activitycalendarfrontend/templates/base/organization_reciept.php
Property Changed:
----------------
branches/Version-1_0-branch/
Property changes on: branches/Version-1_0-branch
___________________________________________________________________
Modified: svn:mergeinfo
-
/trunk:6439-6441,6443,6445-6447,6449-6464,6466-6468,6470-6474,6476-6477,6479-6480,6483-6488,6490-6491,6493-6494,6496-6501,6503-6504,6506,6508,6510-6511,6513,6515-6516,6518,6520-6524,6526-6528,6533-6534,6536-6541,6543-6565,6567,6569,6571-6576,6578,6580-6586,6588-6596,6598-6600,6602-6604,6606-6607,6609-6611,6613-6625,6629-6639,6641-6643,6645-6646,6648,6650-6654,6656-6659,6661-6663,6665-6666,6668-6669,6672-6673,6675,6677-6678,6680,6682-6686,6688-6717,6719,6721-6722,6724-6728,6730,6732-6734,6736-6739,6741,6743,6745-6746,6748-6756,6758-6762,6764,6766-6788,6790,6792-6798,6800-6814,6816-6819,6821-6822,6824-6826,6828-6837,6839,6841,6843-6849,6851,6853-6869,6871-6874,6876-6877,6879,6881,6883,6885-6886,6888-6893,6895-6897,6899-6901,6903,6905-6907,6909,6911-6929,6931-6936,6938-6947,6949,6951,6953,6955-6956,6958-6959,6961-6968,6970-6971,6973-6974,6976-6978,6980,6982-7017,7019-7025,7027-7035,7037-7039,7041-7045,7047-7055,7057,7059-7065,7067-7069,7071,7073,7075-7076,7078,7080-7081,7083,7085,7087,7089-7097,7099-7102,7104-7105,7107-7111,7113-7120,7122-7124,7126-7129,7131,7133-7141,7143,7145-7146,7148-7150,7152-7153,7155-7158,7160-7164,7166-7167,7169-7170,7172,7174,7176,7178,7180-7181,7183,7185,7187-7188,7190,7192-7196,7198-7199,7201-7203,7205,7207,7209-7210,7212,7214,7216-7217,7219-7222,7224-7226,7228-7229,7231,7233-7234,7236-7238,7240-7241,7243-7244,7246,7248,7250,7252-7256,7258-7259,7261-7264,7266-7273,7275-7279,7281-7332,7334-7338,7340-7348,7350,7352-7353,7355-7361,7363-7366,7368-7370,7372,7374,7376,7378,7380-7386,7388-7400,7402,7404-7433,7435-7439,7441-7446,7448-7458,7460-7469,7471-7483,7485-7487,7489-7490,7492,7494,7496-7497,7499,7501-7502,7504,7506-7507,7509-7511,7513-7517,7519-7521,7523,7525,7527-7529,7531,7533,7535-7538,7540-7542,7544-7549,7551-7552,7554-7561,7563,7565,7567-7573,7575-7578,7580-7584,7586-7591,7593-7624,7627-7636,7638-7656,7658-7718,7720-7732,7734,7736,7738-7750,7754-7759,7761-7767,7769-7780,7782,7784-7809,7811-7812,7814-7835,7837-7847,7849-7887,7889-7895,7897,7899,7901,7903-7905,7907-7921,7923-7925,7927-7933,7935,7937-7952,7954-7968,7970-7974,7976,7978-7979,7981-7982,7984-7988,7990-7992,7994-8041,8043-8066,8068-8087,8089,8091-8108,8110-8124,8126-8129,8131,8133-8150,8152-8154,8156-8162,8164-8167,8169-8170,8172-8179,8181,8183-8196,8198-8207,8209-8211,8213-8214,8216-8217,8219-8220,8222,8224-8225,8227-8247,8249,8251,8253-8282,8284-8352,8354-8368,8370-8396,8398-8430,8432,8434-8440,8442-8445,8447-8453,8455-8456,8458,8460,8462-8464,8466-8473,8475-8479,8481,8483-8501,8503-8523,8525,8527-8531,8533,8535-8536,8538-8550,8552-8554,8556-8557,8559-8579,8581-8587,8589,8591-8592,8594-8595,8597-8601,8603-8610,8612-8613,8615,8617,8619-8645,8647-8650,8652-8661,8663-8666,8668-8669,8671-8683,8685-8691,8693-8730,8732-8737,8739,8741-8767,8769,8771-8772,8774,8776-8797,8799-8812,8814-8819,8821,8823-8833,8835-8837,8839,8841,8843-8849,8852-8858,8860-8867,8869-8870,8872,8874-8877,8879
+
/trunk:6439-6441,6443,6445-6447,6449-6464,6466-6468,6470-6474,6476-6477,6479-6480,6483-6488,6490-6491,6493-6494,6496-6501,6503-6504,6506,6508,6510-6511,6513,6515-6516,6518,6520-6524,6526-6528,6533-6534,6536-6541,6543-6565,6567,6569,6571-6576,6578,6580-6586,6588-6596,6598-6600,6602-6604,6606-6607,6609-6611,6613-6625,6629-6639,6641-6643,6645-6646,6648,6650-6654,6656-6659,6661-6663,6665-6666,6668-6669,6672-6673,6675,6677-6678,6680,6682-6686,6688-6717,6719,6721-6722,6724-6728,6730,6732-6734,6736-6739,6741,6743,6745-6746,6748-6756,6758-6762,6764,6766-6788,6790,6792-6798,6800-6814,6816-6819,6821-6822,6824-6826,6828-6837,6839,6841,6843-6849,6851,6853-6869,6871-6874,6876-6877,6879,6881,6883,6885-6886,6888-6893,6895-6897,6899-6901,6903,6905-6907,6909,6911-6929,6931-6936,6938-6947,6949,6951,6953,6955-6956,6958-6959,6961-6968,6970-6971,6973-6974,6976-6978,6980,6982-7017,7019-7025,7027-7035,7037-7039,7041-7045,7047-7055,7057,7059-7065,7067-7069,7071,7073,7075-7076,7078,7080-7081,7083,7085,7087,7089-7097,7099-7102,7104-7105,7107-7111,7113-7120,7122-7124,7126-7129,7131,7133-7141,7143,7145-7146,7148-7150,7152-7153,7155-7158,7160-7164,7166-7167,7169-7170,7172,7174,7176,7178,7180-7181,7183,7185,7187-7188,7190,7192-7196,7198-7199,7201-7203,7205,7207,7209-7210,7212,7214,7216-7217,7219-7222,7224-7226,7228-7229,7231,7233-7234,7236-7238,7240-7241,7243-7244,7246,7248,7250,7252-7256,7258-7259,7261-7264,7266-7273,7275-7279,7281-7332,7334-7338,7340-7348,7350,7352-7353,7355-7361,7363-7366,7368-7370,7372,7374,7376,7378,7380-7386,7388-7400,7402,7404-7433,7435-7439,7441-7446,7448-7458,7460-7469,7471-7483,7485-7487,7489-7490,7492,7494,7496-7497,7499,7501-7502,7504,7506-7507,7509-7511,7513-7517,7519-7521,7523,7525,7527-7529,7531,7533,7535-7538,7540-7542,7544-7549,7551-7552,7554-7561,7563,7565,7567-7573,7575-7578,7580-7584,7586-7591,7593-7624,7627-7636,7638-7656,7658-7718,7720-7732,7734,7736,7738-7750,7754-7759,7761-7767,7769-7780,7782,7784-7809,7811-7812,7814-7835,7837-7847,7849-7887,7889-7895,7897,7899,7901,7903-7905,7907-7921,7923-7925,7927-7933,7935,7937-7952,7954-7968,7970-7974,7976,7978-7979,7981-7982,7984-7988,7990-7992,7994-8041,8043-8066,8068-8087,8089,8091-8108,8110-8124,8126-8129,8131,8133-8150,8152-8154,8156-8162,8164-8167,8169-8170,8172-8179,8181,8183-8196,8198-8207,8209-8211,8213-8214,8216-8217,8219-8220,8222,8224-8225,8227-8247,8249,8251,8253-8282,8284-8352,8354-8368,8370-8396,8398-8430,8432,8434-8440,8442-8445,8447-8453,8455-8456,8458,8460,8462-8464,8466-8473,8475-8479,8481,8483-8501,8503-8523,8525,8527-8531,8533,8535-8536,8538-8550,8552-8554,8556-8557,8559-8579,8581-8587,8589,8591-8592,8594-8595,8597-8601,8603-8610,8612-8613,8615,8617,8619-8645,8647-8650,8652-8661,8663-8666,8668-8669,8671-8683,8685-8691,8693-8730,8732-8737,8739,8741-8767,8769,8771-8772,8774,8776-8797,8799-8812,8814-8819,8821,8823-8833,8835-8837,8839,8841,8843-8849,8852-8858,8860-8867,8869-8870,8872,8874-8877,8879,8881
Modified:
branches/Version-1_0-branch/activitycalendarfrontend/templates/base/activity.php
===================================================================
---
branches/Version-1_0-branch/activitycalendarfrontend/templates/base/activity.php
2012-02-15 12:48:56 UTC (rev 8881)
+++
branches/Version-1_0-branch/activitycalendarfrontend/templates/base/activity.php
2012-02-15 12:51:15 UTC (rev 8882)
@@ -4,7 +4,271 @@
$act_so = activitycalendar_soactivity::get_instance();
$contpers_so = activitycalendar_socontactperson::get_instance();
?>
+<style>
+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;
+ text-align: left;
+}
+
+#frontend dl.proplist-col {
+ width: 600px; !important
+}
+
+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;
+ }
+
+div.success {
+ font-weight: normal;
+ margin:10px;
+ padding:5px;
+ font-size:1.1em;
+ text-align: left;
+ background-color: green;
+ border:1px solid #9F6000;
+ color: white;
+}
+
+div.error {
+ font-weight: normal;
+ margin:10px;
+ padding:5px;
+ font-size:1.1em;
+ text-align: left;
+ background-color: red;
+ border:1px solid #9F6000;
+ color: white;
+}
+</style>
<div class="yui-content" style="width: 100%;">
<div id="details">
@@ -139,8 +403,8 @@
<dd>
<?php
if($activity->get_group_id()){
- echo $group->get_name();
- }
+ echo $group->get_name();?>
+ <?php }
?>
</dd>
<dt>
Modified:
branches/Version-1_0-branch/activitycalendarfrontend/templates/base/activity_edit.php
===================================================================
---
branches/Version-1_0-branch/activitycalendarfrontend/templates/base/activity_edit.php
2012-02-15 12:48:56 UTC (rev 8881)
+++
branches/Version-1_0-branch/activitycalendarfrontend/templates/base/activity_edit.php
2012-02-15 12:51:15 UTC (rev 8882)
@@ -13,9 +13,9 @@
var div_select = document.getElementById('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();?>;
+ url =
"/aktivby/registreringsskjema/ny/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;
+ url =
"/aktivby/registreringsskjema/ny/index.php?menuaction=activitycalendarfrontend.uiactivity.get_organization_groups&phpgw_return_as=json&orgid="
+ org_id;
<?php }?>
if(org_id != null && org_id == 'new_org')
@@ -79,7 +79,7 @@
var address = document.getElementById('address_txt').value;
var div_address = document.getElementById('address_container');
- url =
"index.php?menuaction=activitycalendarfrontend.uiactivity.get_address_search&phpgw_return_as=json&search="
+ address;
+ url =
"/aktivby/registreringsskjema/ny/index.php?menuaction=activitycalendarfrontend.uiactivity.get_address_search&phpgw_return_as=json&search="
+ address;
var divcontent_start = "<select name=\"address\" id=\"address\" size\"5\">";
var divcontent_end = "</select>";
@@ -101,7 +101,7 @@
var address = document.getElementById('contact2_address_txt').value;
var div_address = document.getElementById('contact2_address_container');
- url =
"index.php?menuaction=activitycalendarfrontend.uiactivity.get_address_search&phpgw_return_as=json&search="
+ address;
+ url =
"/aktivby/registreringsskjema/ny/index.php?menuaction=activitycalendarfrontend.uiactivity.get_address_search&phpgw_return_as=json&search="
+ address;
var divcontent_start = "<select name=\"contact2_address\" id=\"address_cp2\"
size\"5\">";
var divcontent_end = "</select>";
@@ -153,7 +153,271 @@
}
</script>
+<style>
+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;
+ text-align: left;
+}
+
+#frontend dl.proplist-col {
+ width: 600px; !important
+}
+
+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;
+ }
+
+div.success {
+ font-weight: normal;
+ margin:10px;
+ padding:5px;
+ font-size:1.1em;
+ text-align: left;
+ background-color: green;
+ border:1px solid #9F6000;
+ color: white;
+}
+
+div.error {
+ font-weight: normal;
+ margin:10px;
+ padding:5px;
+ font-size:1.1em;
+ text-align: left;
+ background-color: red;
+ border:1px solid #9F6000;
+ color: white;
+}
+</style>
<div class="yui-content" style="width: 100%;">
<div id="details">
Modified:
branches/Version-1_0-branch/activitycalendarfrontend/templates/base/activity_edit_step_1.php
===================================================================
---
branches/Version-1_0-branch/activitycalendarfrontend/templates/base/activity_edit_step_1.php
2012-02-15 12:48:56 UTC (rev 8881)
+++
branches/Version-1_0-branch/activitycalendarfrontend/templates/base/activity_edit_step_1.php
2012-02-15 12:51:15 UTC (rev 8882)
@@ -17,7 +17,7 @@
var org_id = document.getElementById('organization_id').value;
var div_select = document.getElementById('activity_select');
- url =
"index.php?menuaction=activitycalendarfrontend.uiactivity.get_organization_activities&phpgw_return_as=json&orgid="
+ org_id;
+ url =
"/aktivby/registreringsskjema/ny/index.php?menuaction=activitycalendarfrontend.uiactivity.get_organization_activities&phpgw_return_as=json&orgid="
+ org_id;
var divcontent_start = "<select name=\"activity_id\" id=\"activity_id\">";
var divcontent_end = "</select>";
@@ -39,6 +39,271 @@
get_activities();
});
</script>
+<style>
+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;
+ text-align: left;
+}
+
+#frontend dl.proplist-col {
+ width: 600px; !important
+}
+
+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;
+ }
+
+div.success {
+ font-weight: normal;
+ margin:10px;
+ padding:5px;
+ font-size:1.1em;
+ text-align: left;
+ background-color: green;
+ border:1px solid #9F6000;
+ color: white;
+}
+
+div.error {
+ font-weight: normal;
+ margin:10px;
+ padding:5px;
+ font-size:1.1em;
+ text-align: left;
+ background-color: red;
+ border:1px solid #9F6000;
+ color: white;
+}
+</style>
<div class="yui-content" style="width: 100%;">
<h1><?php echo lang('edit_activity');?></h1>
<form action="#" method="post">
Modified:
branches/Version-1_0-branch/activitycalendarfrontend/templates/base/activity_new.php
===================================================================
---
branches/Version-1_0-branch/activitycalendarfrontend/templates/base/activity_new.php
2012-02-15 12:48:56 UTC (rev 8881)
+++
branches/Version-1_0-branch/activitycalendarfrontend/templates/base/activity_new.php
2012-02-15 12:51:15 UTC (rev 8882)
@@ -38,7 +38,7 @@
var address = document.getElementById('address_txt').value;
var div_address = document.getElementById('address_container');
- url =
"index.php?menuaction=activitycalendarfrontend.uiactivity.get_address_search&phpgw_return_as=json&search="
+ address;
+ url =
"/aktivby/registreringsskjema/ny/index.php?menuaction=activitycalendarfrontend.uiactivity.get_address_search&phpgw_return_as=json&search="
+ address;
var divcontent_start = "<select name=\"address\" id=\"address\" size\"5\">";
var divcontent_end = "</select>";
@@ -60,7 +60,7 @@
var address = document.getElementById('arena_address_txt').value;
var div_address = document.getElementById('arena_address_container');
- url =
"index.php?menuaction=activitycalendarfrontend.uiactivity.get_address_search&phpgw_return_as=json&search="
+ address;
+ url =
"/aktivby/registreringsskjema/ny/index.php?menuaction=activitycalendarfrontend.uiactivity.get_address_search&phpgw_return_as=json&search="
+ address;
var divcontent_start = "<select name=\"arena_address\" id=\"arena_address\"
size\"5\">";
var divcontent_end = "</select>";
@@ -82,7 +82,7 @@
var address = document.getElementById('contact2_address_txt').value;
var div_address = document.getElementById('contact2_address_container');
- url =
"index.php?menuaction=activitycalendarfrontend.uiactivity.get_address_search&phpgw_return_as=json&search="
+ address;
+ url =
"/aktivby/registreringsskjema/ny/index.php?menuaction=activitycalendarfrontend.uiactivity.get_address_search&phpgw_return_as=json&search="
+ address;
var divcontent_start = "<select name=\"contact2_address\" id=\"address_cp2\"
size\"5\">";
var divcontent_end = "</select>";
@@ -170,7 +170,271 @@
}
</script>
+<style>
+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;
+ text-align: left;
+}
+
+#frontend dl.proplist-col {
+ width: 600px; !important
+}
+
+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;
+ }
+
+div.success {
+ font-weight: normal;
+ margin:10px;
+ padding:5px;
+ font-size:1.1em;
+ text-align: left;
+ background-color: green;
+ border:1px solid #9F6000;
+ color: white;
+}
+
+div.error {
+ font-weight: normal;
+ margin:10px;
+ padding:5px;
+ font-size:1.1em;
+ text-align: left;
+ background-color: red;
+ border:1px solid #9F6000;
+ color: white;
+}
+</style>
<div class="yui-content" style="width: 100%;">
<div id="details">
Modified:
branches/Version-1_0-branch/activitycalendarfrontend/templates/base/activity_new_step_1.php
===================================================================
---
branches/Version-1_0-branch/activitycalendarfrontend/templates/base/activity_new_step_1.php
2012-02-15 12:48:56 UTC (rev 8881)
+++
branches/Version-1_0-branch/activitycalendarfrontend/templates/base/activity_new_step_1.php
2012-02-15 12:51:15 UTC (rev 8882)
@@ -13,6 +13,271 @@
}
}
</script>
+<style>
+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;
+ text-align: left;
+}
+
+#frontend dl.proplist-col {
+ width: 600px; !important
+}
+
+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;
+ }
+
+div.success {
+ font-weight: normal;
+ margin:10px;
+ padding:5px;
+ font-size:1.1em;
+ text-align: left;
+ background-color: green;
+ border:1px solid #9F6000;
+ color: white;
+}
+
+div.error {
+ font-weight: normal;
+ margin:10px;
+ padding:5px;
+ font-size:1.1em;
+ text-align: left;
+ background-color: red;
+ border:1px solid #9F6000;
+ color: white;
+}
+</style>
<div class="yui-content" style="width: 100%;">
<h1><?php echo lang('new_activity') ?></h1>
<form action="#" method="post">
Modified:
branches/Version-1_0-branch/activitycalendarfrontend/templates/base/organization_edit.php
===================================================================
---
branches/Version-1_0-branch/activitycalendarfrontend/templates/base/organization_edit.php
2012-02-15 12:48:56 UTC (rev 8881)
+++
branches/Version-1_0-branch/activitycalendarfrontend/templates/base/organization_edit.php
2012-02-15 12:51:15 UTC (rev 8882)
@@ -9,7 +9,7 @@
var address = document.getElementById('address_txt').value;
var div_address = document.getElementById('address_container');
- url =
"index.php?menuaction=activitycalendarfrontend.uiactivity.get_address_search&phpgw_return_as=json&search="
+ address;
+ url =
"/aktivby/registreringsskjema/ny/index.php?menuaction=activitycalendarfrontend.uiactivity.get_address_search&phpgw_return_as=json&search="
+ address;
var divcontent_start = "<select name=\"address\" id=\"address\" size\"5\">";
var divcontent_end = "</select>";
@@ -61,7 +61,271 @@
}
</script>
+<style>
+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;
+ text-align: left;
+}
+
+#frontend dl.proplist-col {
+ width: 600px; !important
+}
+
+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;
+ }
+
+div.success {
+ font-weight: normal;
+ margin:10px;
+ padding:5px;
+ font-size:1.1em;
+ text-align: left;
+ background-color: green;
+ border:1px solid #9F6000;
+ color: white;
+}
+
+div.error {
+ font-weight: normal;
+ margin:10px;
+ padding:5px;
+ font-size:1.1em;
+ text-align: left;
+ background-color: red;
+ border:1px solid #9F6000;
+ color: white;
+}
+</style>
<div class="yui-content" style="width: 100%;">
<div id="details">
Modified:
branches/Version-1_0-branch/activitycalendarfrontend/templates/base/organization_reciept.php
===================================================================
---
branches/Version-1_0-branch/activitycalendarfrontend/templates/base/organization_reciept.php
2012-02-15 12:48:56 UTC (rev 8881)
+++
branches/Version-1_0-branch/activitycalendarfrontend/templates/base/organization_reciept.php
2012-02-15 12:51:15 UTC (rev 8882)
@@ -9,7 +9,7 @@
var address = document.getElementById('address_txt').value;
var div_address = document.getElementById('address_container');
- url =
"index.php?menuaction=activitycalendarfrontend.uiactivity.get_address_search&phpgw_return_as=json&search="
+ address;
+ url =
"/aktivby/registreringsskjema/ny/index.php?menuaction=activitycalendarfrontend.uiactivity.get_address_search&phpgw_return_as=json&search="
+ address;
var divcontent_start = "<select name=\"address\" id=\"address\" size\"5\">";
var divcontent_end = "</select>";
@@ -61,7 +61,271 @@
}
</script>
+<style>
+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;
+ text-align: left;
+}
+
+#frontend dl.proplist-col {
+ width: 600px; !important
+}
+
+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;
+ }
+
+div.success {
+ font-weight: normal;
+ margin:10px;
+ padding:5px;
+ font-size:1.1em;
+ text-align: left;
+ background-color: green;
+ border:1px solid #9F6000;
+ color: white;
+}
+
+div.error {
+ font-weight: normal;
+ margin:10px;
+ padding:5px;
+ font-size:1.1em;
+ text-align: left;
+ background-color: red;
+ border:1px solid #9F6000;
+ color: white;
+}
+</style>
<div class="yui-content" style="width: 100%;">
<h1><?php echo lang('edit_organization') ?></h1>
<div id="details">
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Fmsystem-commits] [8882] Merge 8880:8881 from trunk,
Sigurd Nes <=