Index: branches/1.1.x/in-news/elements/html_head.elm.tpl
===================================================================
--- branches/1.1.x/in-news/elements/html_head.elm.tpl (revision 13480)
+++ branches/1.1.x/in-news/elements/html_head.elm.tpl (revision 13481)
@@ -1,3 +1,3 @@
-<link rel="stylesheet" rev="stylesheet" href="<inp2:m_TemplatesBase module="In-News"/>inc/styles.css" type="text/css" />
-<!--<script type="text/javascript" src="<inp2:m_TemplatesBase module="In-News"/>inc/script.js"></script>-->
+<inp2:m_Compress files="in-news/inc/styles.css" to="all_css"/>
+<!--## <inp2:m_Compress files="in-news/inc/script.js" to="all_js"/> ##-->
Index: branches/1.1.x/in-link/elements/html_head.elm.tpl
===================================================================
--- branches/1.1.x/in-link/elements/html_head.elm.tpl (revision 13480)
+++ branches/1.1.x/in-link/elements/html_head.elm.tpl (revision 13481)
@@ -1,11 +1,11 @@
-<link rel="stylesheet" rev="stylesheet" href="<inp2:m_TemplatesBase module="In-Link"/>inc/styles.css" type="text/css" />
-<!--<script type="text/javascript" src="<inp2:m_TemplatesBase module="In-Link"/>inc/script.js"></script>-->
+<inp2:m_Compress files="in-link/inc/styles.css" to="all_css"/>
+<!--## <inp2:m_Compress files="in-link/inc/script.js" to="all_js"/> ##-->
<!--## GOOGLE MAPS API INTEGRATION ##-->
<inp2:m_if check="m_IsActive" t="in-link/detail">
<inp2:m_if check="m_GetConfig" name="l_EnableGoogleMaps">
-<script type="text/javascript" src="http://www.google.com/jsapi?key=<inp2:m_GetConfig name="l_GoogleMapsAPIKey"/>"></script>
-<script type="text/javascript" src="<inp2:m_TemplatesBase module="In-Link"/>inc/googlemaps.js"></script>
+ <script type="text/javascript" src="http://www.google.com/jsapi?key=<inp2:m_GetConfig name='l_GoogleMapsAPIKey'/>"></script>
+ <inp2:m_Compress files="in-link/inc/googlemaps.js" to="all_js"/>
</inp2:m_if>
</inp2:m_if>
<!--## GOOGLE MAPS API INTEGRATION ##-->
Index: branches/1.1.x/in-bulletin/inc/styles.css
===================================================================
--- branches/1.1.x/in-bulletin/inc/styles.css (revision 13480)
+++ branches/1.1.x/in-bulletin/inc/styles.css (revision 13481)
@@ -1,149 +1,149 @@
.bbcode {
border: 1px solid #888888;
background-color: #EEEEEE;
padding: 10px;
}
.forums-header TD
{
padding:6px;
color:#21619e;
}
.forums-icon-cell
{
width:20px;
padding-right:10px;
vertical-align:top;
}
.forums-subheaders
{
background:#f4f4f4;
font-weight:bold;
padding:5px 15px;
font-size:12px;
}
.forums-subheaders A
{
color:#000000;
text-decoration: underline;
}
.forums-subheaders A:hover
{
color: #666666;
text-decoration: underline;
}
.forums-cells
{
vertical-align: middle;
padding:10px;
}
.post-background-1
{
background:#f4f4f4;
padding:8px;
}
.post-background-2
{
background:#FFFFFF;
padding:8px;
}
.post-icon-padding-right
{
padding-right:10px;
}
.topic-prewiew-padding-cell TD
{
padding: 13px;
}
.post-control {
padding: 0px !important;
vertical-align: top;
}
.no-padding TD
{
padding:0px;
}
.forums-icon-description TD
{
padding:10px;
vertical-align:middle;
}
.topics-icon-padding
{
width:14px;
padding-right:10px;
}
.new-private-message {
font-weight: bold;
}
.quoted-reply {
border: 1px dashed #333;
}
.quoted-reply td {
padding: 5px;
}
/* --- Topic Button Styles --- */
.big-button-left-border {
- background: #EFEFEF url('../img/big_buttons/left_border.gif') repeat-y top left;
+ background: #EFEFEF url('@templates_base@/in-bulletin/img/big_buttons/left_border.gif') repeat-y top left;
}
.big-button-bottom td {
- background: #EFEFEF url('../img/big_buttons/bottom_border.gif') repeat-x top left;
+ background: #EFEFEF url('@templates_base@/in-bulletin/img/big_buttons/bottom_border.gif') repeat-x top left;
}
.big-button-text {
- background: #EFEFEF url('../img/big_buttons/top_border.gif') repeat-x top left;
+ background: #EFEFEF url('@templates_base@/in-bulletin/img/big_buttons/top_border.gif') repeat-x top left;
font: bold 11px Arial, sans-serif;
letter-spacing: 0px;
color: #1F569A;
padding-top: 14px;
}
.big-button-text a, .big-button-text a:hover {
text-decoration: none;
}
/* --- Post Button Styles --- */
.small-button-bottom td {
- background: #efefef url('../img/small_buttons/bottom_border.gif') repeat-x top left
+ background: #efefef url('@templates_base@/in-bulletin/img/small_buttons/bottom_border.gif') repeat-x top left
}
.small-button-text {
- background: url('../img/small_buttons/top_border.gif') repeat-x top left;
+ background: url('@templates_base@/in-bulletin/img/small_buttons/top_border.gif') repeat-x top left;
font: 10px Arial, sans-serif;
color: #153C6A;
padding-top: 15px;
vertical-align: bottom;
height: 27px;
}
.small-button-text a {
color: #153C6A;
text-decoration: none;
}
.small-button-text a:hover {
text-decoration: none;
}
\ No newline at end of file
Index: branches/1.1.x/in-bulletin/elements/html_head.elm.tpl
===================================================================
--- branches/1.1.x/in-bulletin/elements/html_head.elm.tpl (revision 13480)
+++ branches/1.1.x/in-bulletin/elements/html_head.elm.tpl (revision 13481)
@@ -1,6 +1,12 @@
-<link rel="stylesheet" rev="stylesheet" href="<inp2:m_TemplatesBase module="In-Bulletin"/>inc/styles.css" type="text/css" />
-<script type="text/javascript" src="<inp2:m_TemplatesBase module="In-Bulletin"/>inc/script.js"></script>
+<inp2:m_Compress files="in-bulletin/inc/styles.css" to="all_css"/>
+<inp2:m_Compress files="in-bulletin/inc/script.js" to="all_js"/>
<script type="text/javascript">
- var aPollManager = new PollManager('<inp2:m_Link template="in-bulletin/elements/side_boxes/poll_results.elm" events[#PREFIX#]="OnMakeVote" poll_id="#POLL_ID#" option_id="#OPTION_ID#" no_amp="1"/>');
+ var aPollManager = null;
+
+ $(document).ready(
+ function () {
+ aPollManager = new PollManager('<inp2:m_Link template="in-bulletin/elements/side_boxes/poll_results.elm" events[#PREFIX#]="OnMakeVote" poll_id="#POLL_ID#" option_id="#OPTION_ID#" no_amp="1"/>');
+ }
+ );
</script>
\ No newline at end of file
Index: branches/1.1.x/platform/inc/dmenu.css
===================================================================
--- branches/1.1.x/platform/inc/dmenu.css (revision 13480)
+++ branches/1.1.x/platform/inc/dmenu.css (revision 13481)
@@ -1,132 +1,132 @@
/* Horizontal (menubar) menu */
.horz_nlsmenu {
background-color: inherit;
z-index:1;
width: auto;
}
.horz_nlsitemcontainer {
height: 37px;
color: #ffffff;
padding: 0px 13px;
}
.horz_nlsiconcell {width:16px;}
.horz_nlssubmenucell{width:20px;}
.horz_nlsitem {
font-size:8pt;
color: #ffffff;
padding:2px 5px 2px 5px;
}
.horz_nlsitemcontainerover {
height: 37px;
- background:url(../img/top_menu_select.gif);
+ background:url(@templates_base@/platform/img/top_menu_select.gif);
padding: 0px 13px;
}
.horz_nlsiconcellover {width:16px;}
.horz_nlssubmenucellover {width:20px;}
.horz_nlsitemover {
font-size:8pt;
color: #FFFFFF;
padding:2px 5px 2px 5px;
}
.horz_nlsitemdisable {
font-family:verdana;
font-size:8pt;
color:#999999;
padding:2px 5px 2px 5px;
}
.horz_nlsseparatorcontainer {padding-left:0px; width:1px;}
.horz_nlsseparator {
height:5px;
width:1px;
background-image:url(img/vseparator.gif);
background-position:center center;
background-repeat:repeat-x;
}
.horz_mtopleft {height:0px; width:0px;}
.horz_mtopright {height:0px; width:0px;}
.horz_mbottomleft {width:0px; height:0px;}
.horz_mbottomright {width:0px; height:0px;}
.horz_mtop {height:0px;}
.horz_mbottom {height:0px;}
.horz_mleft {width:0px;}
.horz_mright {width:0px;}
.horz_horzshadow { -moz-opacity:0.4; background-repeat:no-repeat; background-image:url(img/hshadow.gif);filter:progid:DXImageTransform.Microsoft.Alpha( Opacity=40, FinishOpacity=0, Style=0, StartX=0, FinishX=100, StartY=0, FinishY=100);}
.horz_vertshadow { -moz-opacity:0.4; background-repeat:no-repeat; background-image:url(img/vshadow.gif);filter:progid:DXImageTransform.Microsoft.Alpha( Opacity=40, FinishOpacity=0, Style=0, StartX=0, FinishX=100, StartY=0, FinishY=100);}
.horz_cornshadow { -moz-opacity:0.4; background-repeat:no-repeat; background-image:url(img/cornershadow.gif);filter:progid:DXImageTransform.Microsoft.Alpha( Opacity=40, FinishOpacity=0, Style=0, StartX=0, FinishX=100, StartY=0, FinishY=100);}
/* Vertical (drop-down) menus */
.nlsmenu {
background-color: #105596;
z-index:1;
width: auto !important;
color: #ffffff;
padding: 2px 2px;
border: 1px solid #6291BB;
}
.nlsitemcontainer {
height:25px;
padding:2px 10px 2px 10px;
border: 1px solid #6291BB;
}
.nlsiconcell {width:22px;}
.nlssubmenucell{width:20px;}
.nlsitem {
font-size:8pt;
color: #ffffff;
padding:0px 7px;
}
.nlsitemcontainerover {
height:25px;
border: 1px solid #6291BB;
- background:url(../img/top_menu_select.gif);
+ background:url(@templates_base@/platform/img/top_menu_select.gif);
padding: 2px 10px 2px 10px;
}
.nlsiconcellover {width:22px;}
.nlssubmenucellover {width:20px;}
.nlsitemover {
font-size:8pt;
color:#ffffff;
padding:0px 7px;
}
.nlsitemdisable {
font-size:8pt;
color:#999999;
padding:2px 5px 2px 5px;
}
.nlsseparatorcontainer {padding-left:28px;}
.nlsseparator {
height:5px;
background-image:url(img/separator.gif);
background-position:center center;
background-repeat:repeat-x;
}
.mtopleft {height:0px; width:0px;}
.mtopright {height:0px; width:0px;}
.mbottomleft {width:0px; height:0px;}
.mbottomright {width:0px; height:0px;}
.mtop {height:0px;}
.mbottom {height:0px;}
.mleft {width:0px;}
.mright {width:0px;}
.horzshadow { -moz-opacity:0.4;background-repeat:no-repeat; background-image:url(img/hshadow.gif);filter:progid:DXImageTransform.Microsoft.Alpha( Opacity=40, FinishOpacity=0, Style=0, StartX=0, FinishX=100, StartY=0, FinishY=100);}
.vertshadow { -moz-opacity:0.4;background-repeat:no-repeat; background-image:url(img/vshadow.gif);filter:progid:DXImageTransform.Microsoft.Alpha( Opacity=40, FinishOpacity=0, Style=0, StartX=0, FinishX=100, StartY=0, FinishY=100);}
.cornshadow { -moz-opacity:0.4;background-repeat:no-repeat; background-image:url(img/cornershadow.gif);filter:progid:DXImageTransform.Microsoft.Alpha( Opacity=40, FinishOpacity=0, Style=0, StartX=0, FinishX=100, StartY=0, FinishY=100);}
Index: branches/1.1.x/platform/inc/styles.css
===================================================================
--- branches/1.1.x/platform/inc/styles.css (revision 13480)
+++ branches/1.1.x/platform/inc/styles.css (revision 13481)
@@ -1,642 +1,642 @@
/* --- Golbal Usage Styles --- */
html, body {
margin: 0px;
padding: 0px;
height: 100%;
border: none;
font: 9pt Arial;
color: #000000;
}
.fullwidth {
width: 100%;
}
table {
margin: 0px;
padding: 0px;
border-collapse: collapse;
}
td {
font: 11px Arial, serif;
color: #000000;
margin: 0px;
padding: 0px;
}
.hidden-element {
display: none;
}
.horizontal-separator {
- background: url('../img/horizontal_dashed_line.gif') bottom repeat-x;
+ background: url('@templates_base@/platform/img/horizontal_dashed_line.gif') bottom repeat-x;
}
.vertical-separator {
- background: url('../img/vertical_dashed_line.gif') top center repeat-y;
+ background: url('@templates_base@/platform/img/vertical_dashed_line.gif') top center repeat-y;
}
img, img A {
border: 0px;
}
form {
display: inline;
}
.top-background {
- background: url('../img/top_background.gif') right repeat-y;
+ background: url('@templates_base@/platform/img/top_background.gif') right repeat-y;
}
.top-baner-cell
{
padding: 10px;
text-align:center;
}
.menu-background {
- background: url('../img/menu_background.gif') top repeat-x #1865AC;
+ background: url('@templates_base@/platform/img/menu_background.gif') top repeat-x #1865AC;
width: 100%;
}
.top-select-padding {
padding: 0px 15px;
}
.footer-table td {
- background: url('../img/footer_blue.gif') top repeat-x;
+ background: url('@templates_base@/platform/img/footer_blue.gif') top repeat-x;
height: 26px;
color: #F7EEE4;
font-size: 10px;
padding: 0px 10px;
}
.footer-table a {
color: #F7EEE4;
}
/* --- Link Styles --- */
a {
color: #197ACA;
}
a:hover {
color: #FF9900;
}
a.more-link {
font-size: 10px;
}
a.item-action {
font-size: 9px;
color: #666666;
}
a.item-action:hover {
color: #000000;
}
.footer-links {
text-align: right;
padding: 5px 10px;
}
.footer-links A {
color: #333333;
font-size: 10px;
}
.footer-links A:hover {
color: #666666;
}
/* --- Side Box Styles --- */
.side-box-header {
- background: url('../img/side_boxes_background.gif') bottom repeat-x #83AFD6;
+ background: url('@templates_base@/platform/img/side_boxes_background.gif') bottom repeat-x #83AFD6;
height: 29px;
padding: 0px 8px 0px 20px;
}
.side-box-title {
font-size: 12px;
color: #FFFFFF;
}
.side-box-title A {
font-size: 12px;
color: #FFFFFF;
text-decoration: underline;
}
.side-box-title A:hover {
font-size: 12px;
color: #FFDC0E;
}
.side-box-content {
- background: url('../img/side_boxes_content.gif') top repeat-x;
+ background: url('@templates_base@/platform/img/side_boxes_content.gif') top repeat-x;
padding: 20px 20px;
}
/* --- Content Box Styles --- */
.content-box-header {
background: #F0F5FA;
height: 29px;
padding: 0px 20px;
}
.content-box-title {
font-size: 15px;
font-family: Arial;
color: #000000;
font-weight: bold;
}
.content-box-content {
background: #FFFFFF;
padding: 20px 20px 0px 20px;
}
/* --- Form Control Styles --- */
.input-text, .input-textarea {
- background: url('../img/input_text_background.gif') top repeat-x #FFFFFF;
+ background: url('@templates_base@/platform/img/input_text_background.gif') top repeat-x #FFFFFF;
border: 1px solid #7091B9;
font-family: Arial, Helvetica, sans-serif;
font-size: 11px;
}
.input-textarea {
overflow: auto;
}
.input-select {
color: #333333;
font-size: 11px;
}
.button {
- background: url('../img/input_button_background.gif') bottom repeat-x #efefef;
+ background: url('@templates_base@/platform/img/input_button_background.gif') bottom repeat-x #efefef;
border: 1px solid #688BAC;
padding: 0px;
font-size: 11px;
padding: 0px 5px;
}
.delete-button {
- background: url('../img/delete_button_background.gif') bottom repeat-x #FF6D6D;
+ background: url('@templates_base@/platform/img/delete_button_background.gif') bottom repeat-x #FF6D6D;
color: #FFFFFF;
border: 1px solid #CC0000;
padding: 0px;
font-size: 11px;
padding: 0px 5px;
}
/* --- Form Field Styles --- */
.field-name {
padding: 5px 15px;
color: #2E5679;
font-weight: bold;
font-size: 11px;
}
.field-required {
color: #FF0000;
}
.field-hint {
color: #000000;
font-size: 10px;
}
.field-error {
color: #CC0000;
font-size: 10px;
}
.field-value {
padding: 6px 5px;
}
.warning-message td {
padding: 5px;
background: #FFE5E6;
font-size: 16px;
}
.item-categories td {
padding: 1px;
}
/* --- Login Sidebox Styles --- */
.login-status, .login-status a {
font-size: 10px;
color: #FFFFFF;
}
.login-status a:hover {
font-size: 10px;
}
.remember-login {
color: #000000;
font-size: 9px;
}
/* --- Navigation Bar Styles --- */
.navigation-bar {
- background: url('../img/side_boxes_background.gif') bottom repeat-x #83AFD6;
+ background: url('@templates_base@/platform/img/side_boxes_background.gif') bottom repeat-x #83AFD6;
height: 29px;
padding: 0px 20px;
font-size: 12px;
color: #FFFFFF;
}
.navigation-bar A {
color: #FFFFFF;
}
.navigation-bar A:hover {
color: #FFDC0E;
}
/* --- Top Right Menu Styles --- */
.menu-top-active-icon, .menu-top-active-text {
- background: url('../img/top_menu_select.gif');
+ background: url('@templates_base@/platform/img/top_menu_select.gif');
}
td.top-menu-padding {
height: 37px;
white-space: nowrap;
}
.menu-top-noactive-icon, .menu-top-active-icon {
padding: 0px 5px 0px 13px;
}
.menu-top-noactive-text, .menu-top-active-text {
padding: 0px 13px 0px 3px;
}
a.top-menu-link, a.top-menu-link:hover {
font-size: 11px;
text-decoration: none;
}
a.top-menu-link {
color: #FFFFFF;
}
a.top-menu-link:hover {
color: #CCCCCC;
}
/* --- Tab Styles --- */
.inactive-tab, .active-tab {
padding:5px 10px;
border: 1px solid #94c0de;
}
.inactive-tab {
background-color: #eff4fa;
}
.active-tab {
background-color: #FFFFFF;
border-bottom-color: #FFFFFF;
}
.tab-bottom-line {
- background: url('../img/pixel_blue.gif') bottom repeat-x;
+ background: url('@templates_base@/platform/img/pixel_blue.gif') bottom repeat-x;
}
.tab-bottom-content {
border-right:1px solid #94c0de;
border-left:1px solid #94c0de;
border-bottom:1px solid #94c0de;
padding:10px;
}
.tab-left-padding {
padding-left: 40px;
}
/* --- Category Listing & My Account Styles --- */
.directory-icon {
width: 22px;
vertical-align: top;
padding: 5px;
}
.directory-text {
padding: 5px 20px 5px 5px;
vertical-align: top;
}
/* --- Item Listing Page & Item Details Page Styles --- */
.item-listing {
- background: url('../img/gradient_background.gif') top repeat-x #FFFFFF;
+ background: url('@templates_base@/platform/img/gradient_background.gif') top repeat-x #FFFFFF;
}
.item-listing-featured {
- background: url('../img/gradient_background_gr.gif') top repeat-x #FFFFFF;
+ background: url('@templates_base@/platform/img/gradient_background_gr.gif') top repeat-x #FFFFFF;
}
.item-listing-lead {
- background: url('../img/gradient_background_red.gif') top repeat-x #FFFFFF;
+ background: url('@templates_base@/platform/img/gradient_background_red.gif') top repeat-x #FFFFFF;
}
.item-padding {
padding: 10px 10px 10px 10px;
}
.item-statistics {
font-size: 10px;
color: #666666;
}
.listing-field-name {
font-weight: bold;
}
.category-statistics {
font-size: 10px;
}
.category-header td {
padding: 5px 20px 5px 5px;
vertical-align: top;
}
.sub-section-header, .sub-section-header td {
background-color: #F4F4F4;
font-weight: bold;
padding: 5px 15px;
font-size: 12px;
}
.listing-row td {
padding: 5px 8px;
}
/* --- Pagination Bar Styles --- */
.current-page {
background: #5B97CB;
color: #FFFFFF;
padding: 1px 2px;
}
a.page-link {
color: #000000;
text-decoration: none;
}
/* --- Calendar Styles --- */
.calendar {
font-family: tahoma,verdana,sans-serif;
color: #000;
font-size: 11px;
border: 1px solid #83B2C5;
width: 225px;
position: relative;
z-index: 1;
display: none;
cursor: default;
}
.calendar table {
/*font-family: tahoma,verdana,sans-serif;*/
color: #000;
font-size: 11px;
background-color: #fefefe;
width: auto;
cursor: default;
border-collapse: separate;
}
.calendar table td {
padding: 2px;
text-align: center;
}
.calendar tbody .disabled {
color: #999;
}
.calendar tbody .emptyrow {
display: none;
}
.calendar tbody .today {
font-weight: bold;
background-color: #eeeeee;
border: 1px solid #aaaaaa !important;
}
.calendar tbody .emptycell {
visibility: hidden;
}
.calendar tbody .active {
background-color: red;
}
.calendar thead .title {
font-weight: bold;
}
.calendar thead .headrow {
}
.calendar thead .active {
background-color: #c4c0b8;
padding: 2px 0px 0px 2px;
}
.calendar thead .hilite {
background-color: #e4e0d8;
}
.calendar tfoot .title {
font-weight: normal;
}
.combo { position: absolute; display: none; width: 4em; top: 0px; left: 0px; cursor: default; border-top: 1px solid #fff; border-right: 1px solid #000; border-bottom: 1px solid #000; border-left: 1px solid #fff; background: #e4e0d8; font-size: smaller; padding: 1px;}
.combo .label { text-align: center; padding: 1px;}
.combo .active { background: #c4c0b8; padding: 0px; border-top: 1px solid #000; border-right: 1px solid #fff; border-bottom: 1px solid #fff; border-left: 1px solid #000;}
.combo .hilite { background: #048; color: #fea;}
.dpContainer {
display: inline;
}
.list-no-squares {
padding: 0px;
list-style-type: none;
margin: 0px;
}
/* --- Listing Element Styles --- */
.picture-padding {
padding: 20px 5px 20px 20px;
vertical-align: top;
width: 120px;
}
.text-padding {
padding: 20px 5px;
}
.file-list-icon
{
padding: 2px 10px 2px 0px;
vertical-align:top;
}
.file-list-label
{
padding: 2px 7px 2px 0px;
vertical-align:top;
}
/* --- Item Raring Styles --- */
.ratingblock, .ratingblock div {
display: -moz-inline-block;
}
.voted {
color: #999;
}
.thanks {
color: #36AA3D;
}
.static {
color: #5D3126;
}
.inline-rating {
display:-moz-inline-block;
display:-moz-inline-box;
display:inline-block;
vertical-align: middle;
}
.star-rating,
.star-rating a:hover,
.star-rating a:active,
.star-rating a:focus,
.star-rating .current-rating{
- background: url('../img/starrating.gif') left -1000px repeat-x;
+ background: url('@templates_base@/platform/img/starrating.gif') left -1000px repeat-x;
}
.star-rating {
position:relative;
width:125px;
height:25px;
overflow:hidden;
list-style:none;
margin:0;
padding:0;
background-position: left top;
}
.star-rating li {
display: inline;
}
.star-rating a,
.star-rating .current-rating {
position:absolute;
top:0;
left:0;
text-indent:-1000em;
height:25px;
line-height:25px;
outline:none;
overflow:hidden;
border: none;
}
.star-rating a:hover,
.star-rating a:active,
.star-rating a:focus {
background-position: left bottom;
}
.star-rating a.r1-unit { width:20%;z-index:6; }
.star-rating a.r2-unit { width:40%;z-index:5; }
.star-rating a.r3-unit { width:60%;z-index:4; }
.star-rating a.r4-unit { width:80%; z-index:3; }
.star-rating a.r5-unit { width:100%; z-index:2; }
.star-rating .current-rating { z-index:1; background-position: left center; }
.small-star {
width:50px;
height:10px;
}
.small-star, .small-star a:hover, .small-star a:active,
.small-star a:focus, .small-star .current-rating {
background-image: url('star_small.gif');
line-height: 10px;
height: 10px;
}
/* --- Unprocessed Styles --- */
.text-title {
font-size: 12px;
font-weight: bold;
color: #1769b5;
}
a.text-title {
font-size: 12px;
font-weight: bold;
color: #1769b5;
}
a.text-title:hover {
color: #005695;
}
/* ----- Depricated Styles ----- */
.error {
color: magenta;
}
.static {
color: #00CC66;
}
.image_boder {
border: 1px solid #CDCECD;
}
.table-border {
border: 1px solid #EAEAEA;
}
.information-background {
background-color: #F6F6FF;
}
#sitemap ul {
margin:0 0 10px 10px;
padding:0 0 0 10px;
}
#sitemap ul li {
color: #0060BB;
list-style-image: none;
list-style-position: outside;
list-style-type: disc;
padding: 5px 0 0;
}
\ No newline at end of file
Index: branches/1.1.x/platform/designs/default_design.des.tpl
===================================================================
--- branches/1.1.x/platform/designs/default_design.des.tpl (revision 13480)
+++ branches/1.1.x/platform/designs/default_design.des.tpl (revision 13481)
@@ -1,123 +1,126 @@
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<inp2:m_CheckSSL/>
<inp2:m_include template="platform/elements/side_boxes.elm" strip_nl="1"/>
<inp2:m_include template="platform/elements/content_boxes.elm" strip_nl="1"/>
<inp2:m_include template="platform/elements/forms.elm" strip_nl="1"/>
<html xmlns="http://www.w3.org/1999/xhtml">
<head>
<inp2:m_DefineElement name="cms_page_title">
<inp2:st_PageInfo type="htmlhead_title"/>
</inp2:m_DefineElement>
<title><inp2:m_GetConfig name="Site_Name"/> :: <inp2:m_RenderElement name="page_title" default_element="cms_page_title" no_editing="1"/></title>
<!--## Include module specific HEADER (META INFORMATION inside) template ##-->
<inp2:m_ModuleInclude template="elements/html_head.elm" in-portal_template="platform/elements/html_head.elm"/>
+ <link rel="stylesheet" rev="stylesheet" href="<inp2:m_Compress from='all_css'/>" type="text/css" />
+ <script type="text/javascript" src="<inp2:m_Compress from='all_js'/>"></script>
+
<inp2:st_EditingScripts/>
<!--## /Include module specific HEADER template ##-->
</head>
<body>
<inp2:st_EditPage mode="start"/>
<div align="left">
<div align="left" style="width:100%">
<table class="fullwidth">
<tr>
<td>
<inp2:m_include template="platform/elements/header.elm"/>
</td>
</tr>
<tr>
<td>
<inp2:m_include template="platform/elements/menu.elm"/>
</td>
</tr>
</table>
<img src="<inp2:m_TemplatesBase module="In-Portal"/>img/s.gif" width="1" height="1" alt=""/><br />
<img src="<inp2:m_TemplatesBase module="In-Portal"/>img/grey_pix.gif" width="100%" height="1" alt=""/><br />
<img src="<inp2:m_TemplatesBase module="In-Portal"/>img/s.gif" width="1" height="1" alt=""/><br />
<table class="fullwidth">
<tr>
<!-- SIDEBAR -->
<td style="width: 200px;" valign="top">
<inp2:m_DefineElement name="cms_sidebar">
<div class="movable-area">
<div class="movable-element">
<inp2:m_RenderElement name="platform/elements/side_boxes/login.elm" design="blue_box"/>
</div>
<div class="movable-element">
<inp2:m_RenderElement name="platform/elements/side_boxes/search.elm" design="blue_box"/>
</div>
</div>
</inp2:m_DefineElement>
<inp2:m_RenderElement name="sidebar" default_element="cms_sidebar"/>
</td>
<!-- /SIDEBAR -->
<!-- SEPARATOR -->
<td width="3" class="vertical-separator" style="width: 3px;">
<img src="<inp2:m_TemplatesBase module="In-Portal"/>img/s.gif" width="3" height="1" alt=""/><br />
</td>
<!-- /SEPARATOR -->
<!-- CONTENT -->
<td style="width: auto;" valign="top">
<inp2:m_DefineElement name="cms_content">
<div class="movable-area">
<div class="movable-element">
<inp2:m_include template="platform/elements/navigation_bar.elm"/>
</div>
<div class="movable-element">
<inp2:m_RenderElement design="content_box">
<inp2:m_Capture to_var="header">
<inp2:st_PageInfo type="title"/>
</inp2:m_Capture>
<inp2:st_ContentBlock num="1"/>
</inp2:m_RenderElement>
</div>
</div>
</inp2:m_DefineElement>
<inp2:m_RenderElement name="content" default_element="cms_content"/>
<br />
</td>
<!-- /CONTENT -->
<!--## REMOVE THIS LINE TO UNCOMMENT
<!-- SEPARATOR -->
<td width="3" class="vertical-separator">
<img src="<inp2:m_TemplatesBase module="In-Portal"/>img/s.gif" width="3" height="1" alt=""/><br />
</td>
<!-- /SEPARATOR -->
<!-- RIGHT-SIDEBAR WITH BANNER -->
<td style="width: 200px;" valign="top">
<div class="movable-area">
<div class="movable-element">
<inp2:m_include template="platform/elements/banners/banner_right.elm"/>
</div>
</div>
</td>
<!-- /RIGHT-SIDEBAR WITH BANNER -->
REMOVE THIS LINE TO UNCOMMENT ##-->
</tr>
</table>
<table class="fullwidth">
<tr>
<td >
<inp2:m_include template="platform/elements/footer.elm"/>
</td>
</tr>
</table>
</div>
</div>
<inp2:st_EditPage mode="end"/>
</body>
</html>
\ No newline at end of file
Index: branches/1.1.x/platform/elements/html_head.elm.tpl
===================================================================
--- branches/1.1.x/platform/elements/html_head.elm.tpl (revision 13480)
+++ branches/1.1.x/platform/elements/html_head.elm.tpl (revision 13481)
@@ -1,39 +1,49 @@
<!--## Meta Info (Keywords and Description) ##-->
-<meta http-equiv="Content-Type" content="text/html; charset=<inp2:lang.current_Field name="Charset"/>" />
+<meta http-equiv="Content-Type" content="text/html; charset=<inp2:lang.current_Field name='Charset'/>" />
-<meta name="Description" content="<inp2:st_PageInfo type="meta_description"/>" />
-<meta name="Keywords" content="<inp2:st_PageInfo type="meta_keywords"/>" />
+<meta name="Description" content="<inp2:st_PageInfo type='meta_description'/>" />
+<meta name="Keywords" content="<inp2:st_PageInfo type='meta_keywords'/>" />
<!--## /Meta Keywords and Description ##-->
<inp2:theme.current_StylesheetFile/>
<inp2:m_ifnot check="m_GetConst" name="EDITING_MODE">
- <link rel="stylesheet" href="<inp2:m_TemplatesBase module='In-Portal'/>inc/jquery/thickbox/thickbox.css" type="text/css" media="screen" />
+ <inp2:m_Compress files="platform/inc/jquery/thickbox/thickbox.css" to="all_css"/>
</inp2:m_ifnot>
-<link rel="stylesheet" rev="stylesheet" href="<inp2:m_TemplatesBase module='In-Portal'/>inc/styles.css" type="text/css" />
+<inp2:m_Compress files="platform/inc/styles.css" to="all_css"/>
-<script type="text/javascript" src="<inp2:m_TemplatesBase module='In-Portal'/>inc/script.js"></script>
-<script type="text/javascript" src="<inp2:m_TemplatesBase module='In-Portal'/>inc/ajax.js"></script>
-<script type="text/javascript" src="<inp2:m_TemplatesBase module='In-Portal'/>inc/calendar.js"></script>
+<inp2:m_Compress files="platform/inc/script.js|platform/inc/ajax.js|platform/inc/calendar.js" to="all_js"/>
<script type="text/javascript">var inportalBase = '<inp2:m_TemplatesBase module="In-Portal"/>';</script>
<script type="text/javascript" src="<inp2:m_TemplatesBase module='In-Portal'/>inc/jquery/jquery.pack.js"></script>
<inp2:m_ifnot check="m_GetConst" name="EDITING_MODE">
- <script type="text/javascript" src="<inp2:m_TemplatesBase module='In-Portal'/>inc/jquery/thickbox/thickbox.js"></script>
+ <inp2:m_Compress files="platform/inc/jquery/thickbox/thickbox.js" to="all_js"/>
</inp2:m_ifnot>
<script type="text/javascript">
- var aRatingManager = new RatingManager('<inp2:m_Link template="index" events[#PREFIX#]="OnMakeVote" rating="#VOTE#" id="#ID#" no_amp="1" size="#SIZE#"/>');
+ var aRatingManager = null;
+
+ $(document).ready(
+ function () {
+ aRatingManager = new RatingManager('<inp2:m_Link template="index" events[#PREFIX#]="OnMakeVote" rating="#VOTE#" id="#ID#" no_amp="1" size="#SIZE#"/>');
+ }
+ );
<inp2:m_Cache key="prefix:lang;skip_var:t,page,per_page,sort_by">
<inp2:m_DefineElement name="ml_selector_language_element">
<inp2:Field name="LanguageId"/>: {'on': '<inp2:Field name="IconURL" js_ecape="1"/>', 'off': '<inp2:Field name="IconDisabledURL" js_ecape="1"/>'}
<inp2:m_ifnot check="m_Param" name="is_last">,</inp2:m_ifnot>
</inp2:m_DefineElement>
- var aMultiLanguageSelector = new MultiLanguageSelector({<inp2:lang.enabled_PrintList render_as="ml_selector_language_element" per_page="-1" no_editing="1" strip_nl="2"/>}, <inp2:m_Get name="m_lang"/>);
+ var aMultiLanguageSelector = null;
+
+ $(document).ready(
+ function () {
+ aMultiLanguageSelector = new MultiLanguageSelector({<inp2:lang.enabled_PrintList render_as="ml_selector_language_element" per_page="-1" no_editing="1" strip_nl="2"/>}, <inp2:m_Get name="m_lang"/>);
+ }
+ );
</inp2:m_Cache>
</script>
Index: branches/1.1.x/platform/elements/menu.elm.tpl
===================================================================
--- branches/1.1.x/platform/elements/menu.elm.tpl (revision 13480)
+++ branches/1.1.x/platform/elements/menu.elm.tpl (revision 13481)
@@ -1,105 +1,107 @@
<table class="menu-background fullwidth">
<tr>
<td align="left">
<table style="width: auto;">
<tr>
<td>
- <script type="text/javascript" src="<inp2:m_TemplatesBase module='In-Portal'/>inc/nlsmenu.js"></script>
- <script type="text/javascript" src="<inp2:m_TemplatesBase module='In-Portal'/>inc/nlsmenueffect.js"></script>
- <script type="text/javascript" src="<inp2:m_TemplatesBase module='In-Portal'/>inc/nlsmenuext_dyn.js"></script>
- <script type="text/javascript" src="<inp2:m_TemplatesBase module='In-Portal'/>inc/nlsmenuext_xml.js"></script>
+ <script type="text/javascript" src="<inp2:m_Compress files='
+ platform/inc/nlsmenu.js|
+ platform/inc/nlsmenueffect.js|
+ platform/inc/nlsmenuext_dyn.js|
+ platform/inc/nlsmenuext_xml.js
+ '/>"></script>
- <link rel="StyleSheet" href="<inp2:m_TemplatesBase module='In-Portal'/>inc/dmenu.css" type="text/css" />
+ <link rel="StyleSheet" href="<inp2:m_Compress files='platform/inc/dmenu.css'/>" type="text/css" />
<div id="xmlMenuDiv"></div>
<script type="text/javascript">
<inp2:m_DefineElement name="menu_xml" no_editing="1">
<menumgr id="mgr" flowoverformelement="false" defaulteffect="aoslide" icpath="">
<!--## USE droponclick="false" TO OPEN MENU ONMOUSE-OVER ##-->
<menubar id="menubar" orient="H" showicon="true" showsubicon="false" stlprf="horz_" droponclick="true" >
<items>
<item id="sub-elem0" url="<inp2:m_Link template="index" m_cat_id="0" m_cat_page="1"/>" ico="['<inp2:m_TemplatesBase module="In-portal"/>img/menu_home.gif']" enb="true" title=""><![CDATA[<inp2:m_RootCategoryName/>]]></item>
<inp2:m_Include template="platform/elements/menu_sections.xml" />
</items>
</menubar>
</menumgr>
</inp2:m_DefineElement>
<inp2:m_get name="m_cat_id" result_to_var="current_category"/>
$(document).ready(
function() {
var menu_mgr = NlsMenuUtil.createFromXMLString('<inp2:m_RenderElement name="menu_xml" js_escape="1"/>');
// menu_mgr.renderMenus();
menu_mgr.renderMenubar('xmlMenuDiv');
<inp2:m_if check="m_GetConst" name="EDITING_MODE" equals_to="2">
// make all spans with phrases clickable inside menus, that were just created
aTemplateManager.setupEditTranslationButtons('#xmlMenuDiv');
</inp2:m_if>
}
);
</script>
<noscript>
<inp2:m_DefineElement name="static_top_menu_element">
<inp2:m_Link template="$template" m_cat_id="$cat_id" m_cat_page="1" use_section="$use_section" result_to_var="link"/>
<inp2:m_if check="m_Param" name="menu_icon">
<inp2:m_TemplatesBase result_to_var="module_path"/>
<inp2:m_RenderElement name="menu_element" menu_href="$link" menu_title="$title" menu_icon_src="{$module_path}{$menu_icon}"/>
<inp2:m_else/>
<inp2:m_TemplatesBase module="In-Portal" result_to_var="module_path"/>
<inp2:m_RenderElement name="menu_element" menu_href="$link" menu_title="$title" menu_icon_src="{$module_path}img/menu_inedit.gif"/>
</inp2:m_if>
</inp2:m_DefineElement>
<table>
<tr>
<inp2:m_Link template="index" m_cat_id="0" m_cat_page="1" result_to_var="link"/>
<inp2:m_RootCategoryName result_to_var="title"/>
<inp2:m_TemplatesBase module="In-portal" result_to_var="module_path"/>
<inp2:m_RenderElement name="menu_element" menu_href="$link" menu_title="$title" menu_icon_src="{$module_path}img/menu_home.gif"/>
<inp2:st_CachedMenu level="0" category_id="0" render_as="static_top_menu_element"/>
</tr>
</table>
</noscript>
<inp2:m_Set m_cat_id="$current_category"/>
<inp2:c_Field requery="1" name="Name" result_to_var="category_name"/>
</td>
</tr>
</table>
</td>
<td align="right">
<table style="width: auto;">
<tr>
<!-- menu: My Account -->
<inp2:m_RenderElement design="menu_element">
<inp2:m_Capture to_var="menu_href">
<inp2:m_Link template="platform/my_account/my_account" m_cat_id="0" m_cat_page="1"/>
</inp2:m_Capture>
<inp2:m_Capture to_var="menu_icon">
<img src="<inp2:m_TemplatesBase module="In-Portal"/>img/menu_my_account.gif" alt="" /><br />
</inp2:m_Capture>
<inp2:m_Capture to_var="menu_title">
<inp2:m_Phrase name="lu_title_MyAccount"/>
</inp2:m_Capture>
<inp2:m_IsActive template=".*/my_account" result_to_var="current"/>
</inp2:m_RenderElement>
<!-- // menu: My Account -->
<inp2:m_if check="m_ModuleEnabled" module="In-Commerce">
<!-- menu: ShoppingCart -->
<inp2:m_Include t="in-commerce/elements/menu_element.elm"/>
<!-- // menu: ShoppingCart -->
</inp2:m_if>
</tr>
</table>
</td>
</tr>
</table>
\ No newline at end of file
Index: branches/1.1.x/in-commerce/elements/html_head.elm.tpl
===================================================================
--- branches/1.1.x/in-commerce/elements/html_head.elm.tpl (revision 13480)
+++ branches/1.1.x/in-commerce/elements/html_head.elm.tpl (revision 13481)
@@ -1,6 +1,6 @@
<!--## CSS & JAVASCRIPT FOR IN-COMMERCE ##-->
-<link rel="stylesheet" rev="stylesheet" href="<inp2:m_TemplatesBase module="In-Commerce"/>inc/styles.css" type="text/css" />
-<!--<script type="text/javascript" src="<inp2:m_TemplatesBase module="In-Commerce"/>inc/script.js"></script>-->
+<inp2:m_Compress files="in-commerce/inc/styles.css" to="all_css"/>
+<!--## <inp2:m_Compress files="in-commerce/inc/script.js" to="all_js"/> ##-->
<!--## /CSS & JAVASCRIPT FOR IN-COMMERCE ##-->