Page Menu
Home
In-Portal Phabricator
Search
Configure Global Search
Log In
Files
F785589
advanced
No One
Temporary
Actions
View File
Edit File
Delete File
View Transforms
Subscribe
Mute Notifications
Award Token
Flag For Later
Subscribers
None
File Metadata
Details
File Info
Storage
Attached
Created
Wed, Feb 12, 4:20 PM
Size
21 KB
Mime Type
text/x-diff
Expires
Fri, Feb 14, 4:20 PM (1 d, 8 h)
Engine
blob
Format
Raw Data
Handle
564556
Attached To
rTADV Themes.Advanced
advanced
View Options
Index: branches/1.1.x/in-link/elements/html_head.elm.tpl
===================================================================
--- branches/1.1.x/in-link/elements/html_head.elm.tpl (revision 13750)
+++ branches/1.1.x/in-link/elements/html_head.elm.tpl (revision 13751)
@@ -1,11 +1,11 @@
<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_IsActive" t="in-link/links/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>
<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/elements/side_boxes/polls.elm.tpl
===================================================================
--- branches/1.1.x/in-bulletin/elements/side_boxes/polls.elm.tpl (revision 13750)
+++ branches/1.1.x/in-bulletin/elements/side_boxes/polls.elm.tpl (revision 13751)
@@ -1,65 +1,65 @@
<!-- POllS -->
<inp2:poll_InitList list_name="list_polls" per_page="-1"/>
<inp2:m_Capture to_var="header">
<inp2:m_phrase name="lu_title_Polls"/>
</inp2:m_Capture>
<inp2:m_DefineElement name="answer_element">
<li style="margin-bottom:5px;">
<input type="radio" name="poll_<inp2:Field name="PollId"/>" onclick="getElementById('selected_opt_<inp2:Field name="PollId"/>').value='<inp2:Field name="AnswerId"/>';getElementById('vote_button').disabled=false;"> <inp2:Field name="Answer"/>
</li>
</inp2:m_DefineElement>
<inp2:m_DefineElement name="poll_element">
<div style="margin-bottom:25px;">
<div style="text-align:left;">
<strong><inp2:Field name="Question"/></strong>
</div>
<inp2:m_if check="Field" name="Image">
<br/>
<a href="<inp2:Field name="Image" format="resize:640x480"/>" class="thickbox" title="<inp2:Field field="Question"/>">
<img src="<inp2:Field name="Image" format="resize:100x100"/>" border="0" alt="<inp2:Field field="Question"/>"></a>
</inp2:m_if>
<div id="pollvote_<inp2:Field name="PollId"/>" style="text-align:left; margin-top:10px; margin-bottom:10px">
- <inp2:m_if check="Field" name="RequireLogin">
+ <inp2:m_if check="Field" name="RequireLogin" db="1">
<inp2:m_include t="in-bulletin/elements/side_boxes/poll_results.elm"/>
<div style="padding-top:5px; font-style: italic; font-weight: bold; text-align: center">
<inp2:m_phrase name="lu_text_GuestsLoginToVote"/>
</div>
<inp2:m_else/>
<inp2:m_if check="HasVoted">
<inp2:m_include t="in-bulletin/elements/side_boxes/poll_results.elm"/>
<div style="padding-top:5px; font-style: italic; font-weight: bold; text-align: center">
<inp2:m_phrase name="lu_text_AlreadyVoted"/>
</div>
<inp2:m_else/>
<ul style="list-style-type: none; padding-left: 0px;"><inp2:Field name="PollId" result_to_var="poll_id"/>
<inp2:poll-answer_PrintList list_name="list_answers" render_as="answer_element" direction="H" poll_id="$poll_id" requery="1"/>
</ul>
<div style="text-align: center; margin-top:8px; ">
<input type="hidden" id="selected_opt_<inp2:Field name="PollId"/>" name="selected_opt_<inp2:Field name="PollId"/>"/>
<input class="button" type="button" id="vote_button" disabled onclick="aPollManager.makeVote('poll', <inp2:Field name="PollId"/>, getElementById('selected_opt_<inp2:Field name="PollId"/>').value); return false;" value="<inp2:m_Phrase label="lu_btn_Vote" no_editing="1"/>"/>
</div>
</inp2:m_if>
</inp2:m_if>
</div>
<!--## USER COMMENTS ##-->
<inp2:m_if check="Field" name="AllowComments">
<div style="text-align:center;">
<inp2:m_ifnot check="HasCommented">
<a href="<inp2:CommentsLink t="in-bulletin/elements/content_boxes/add_poll_comment.elm" height="480" width="480"/>" title="<inp2:Field name="Question"/>" class="thickbox"/><inp2:m_phrase name="lu_title_AddComment"/></a><br>
</inp2:m_ifnot>
<a href="<inp2:CommentsLink t="in-bulletin/elements/content_boxes/poll_comments.elm" height="480" width="480"/>" title="<inp2:Field name="Question"/>" class="thickbox"/><inp2:m_phrase name="lu_title_ViewComments"/></a>
</div>
</inp2:m_if>
<!--## //USER COMMENTS ##-->
</div>
</inp2:m_DefineElement>
<div style="width:100%; text-align:center;">
<inp2:poll_PrintList list_name="list_polls" render_as="poll_element" direction="H"/>
</div>
<!-- //POllS -->
\ No newline at end of file
Index: branches/1.1.x/platform/inc/script.js
===================================================================
--- branches/1.1.x/platform/inc/script.js (revision 13750)
+++ branches/1.1.x/platform/inc/script.js (revision 13751)
@@ -1,223 +1,216 @@
String.prototype.trim = function() { return this.replace(/^\s+|\s+$/, ''); };
function update_checkbox(cb, cb_hidden) {
cb_hidden.value = cb.checked ? 1 : 0;
}
function redirect($url) {
window.location.href = $url;
}
function open_window($url, $window_name, $width, $height) {
window.open($url, $window_name, 'width='+$width+',height='+$height+',resizable=yes');
return false;
}
function addLoadEvent(func, wnd) {
if (!wnd) wnd = window
var oldonload = wnd.onload;
if (typeof wnd.onload != 'function') {
wnd.onload = func;
} else {
wnd.onload = function() {
if (oldonload) {
oldonload();
}
func();
}
}
}
function addEvent(el, evname, func, traditional) {
if (traditional) {
eval('el.on'+evname+'='+func);
return;
}
if (document.all) {
el.attachEvent("on" + evname, func);
} else {
el.addEventListener(evname, func, true);
}
};
// ItemCategories class
function ItemCategories($table_id, $field_id, $primary_category, $phrases) {
this.CategoryTable = document.getElementById($table_id);
this.CategorySelector = document.getElementById($field_id + '_select');
this.MoreCategoriesField = document.getElementById($field_id);
this.PrimaryCategory = $primary_category;
this.Phrases = $phrases;
// get additional categories from item
if (this.MoreCategoriesField.value.length) {
this.MoreCategories = this.MoreCategoriesField.value;
this.MoreCategories = this.MoreCategories.substring(1, this.MoreCategories.length - 1).split('|');
}
else {
this.MoreCategories = new Array ();
}
}
ItemCategories.prototype.AddCategory = function($separator, $delete_button, $max_categories) {
var $category_id = this.CategorySelector.options[this.CategorySelector.selectedIndex].value;
- var $category_name = this.CategorySelector.options[this.CategorySelector.selectedIndex].innerHTML.trim();
+ var $category_name = this.CategorySelector.options[this.CategorySelector.selectedIndex].getAttribute('full_path');
if ((this.SearchCategory($category_id) !== false) || ($category_id == this.PrimaryCategory) || ($category_id == 0)) {
// don't add same category twice & don't allow to add item's primary category
alert(this.Phrases[1]);
return ;
}
if ((this.MoreCategories.length + 2) > $max_categories)
{
// don't add more category - $max_categories limit
alert(this.Phrases[0]);
return ;
}
- // strip trailing HTML spaces & separator
- var $separator_pos = $category_name.indexOf($separator);
- if ($separator_pos != -1) {
- $category_name = $category_name.substring($separator_pos + $separator.length);
- }
-
-
var $row = this.CategoryTable.insertRow(-1);
$row.id = 'category_' + $category_id;
var $cell = $row.insertCell(-1);
$cell.innerHTML = $category_name;
$cell = $row.insertCell(-1);
$cell.innerHTML = $delete_button.replace(/#CATEGORY_ID#/g, $category_id);
this.MoreCategories.push($category_id);
this.updateMoreCategoriesField();
}
ItemCategories.prototype.SearchCategory = function($category_id) {
var $i = 0;
while ($i < this.CategoryTable.rows.length) {
if (this.CategoryTable.rows[$i].id == 'category_' + $category_id) {
return $i;
}
$i++;
}
return false;
}
ItemCategories.prototype.DeleteCategory = function($category_id) {
var $row_index = this.SearchCategory($category_id);
if ($row_index !== false) {
this.CategoryTable.deleteRow($row_index);
var $i = 0;
while ($i < this.MoreCategories.length) {
if (this.MoreCategories[$i] == $category_id) {
this.MoreCategories.splice($i, 1);
break;
}
$i++;
}
this.updateMoreCategoriesField();
}
}
ItemCategories.prototype.updateMoreCategoriesField = function() {
this.MoreCategoriesField.value = this.MoreCategories.length ? '|' + this.MoreCategories.join('|') + '|' : '';
}
function jq($selector) {
return $selector.replace(/(\[|\]|\.|:)/g, '\\$1');
}
function MultiLanguageSelector($language_info, $current_language) {
this._languageInfo = $language_info;
this._currentLanguage = $current_language;
this._controls = new Array ();
var $me = this;
$(document).ready(
function() {
$me.init();
}
);
}
MultiLanguageSelector.prototype.init = function () {
var $i = 0;
var $me = this;
while ($i < this._controls.length) {
// set current language
$( jq('#' + this._controls[$i]) ).data('PrevLanguage', this._currentLanguage);
for (var $language_id in this._languageInfo) {
var $id = this.inputForLanguage(this._controls[$i], $language_id);
$( jq('#' + $id + '_flag') ).each(
function() {
$(this)
.data('MainControl', $me._controls[$i])
.data('ThisLanguage', $language_id)
.click(
function ($event) {
var $this_flag = $(this);
var $this_language = $this_flag.data('ThisLanguage');
var $main_control = $('#' + jq($this_flag.data('MainControl')) );
var $prev_language = $main_control.data('PrevLanguage');
var $prev_flag = $( jq('#' + $me.inputForLanguage($main_control.attr('id'), $prev_language) + '_flag') );
var $language_info;
if ($this_language != $prev_language) {
// hide prev language input + enable it's flag
var $prev_image = $prev_flag.children('img:first');
if ($prev_image.length) {
// found image for given language
$language_info = $me._languageInfo[$prev_language];
$prev_image.attr('src', $prev_image.attr('src').replace($language_info.off, $language_info.on));
}
$( jq('#' + $prev_flag.attr('id').replace(/_flag$/, '_input') ) ).hide();
// show this language input + disable it's flag
var $this_image = $this_flag.children('img:first');
if ($this_image.length) {
// found image for given language
$language_info = $me._languageInfo[$this_language];
$this_image.attr('src', $this_image.attr('src').replace($language_info.on, $language_info.off));
}
var $this_container = $( jq('#' + $this_flag.attr('id').replace(/_flag$/, '_input') ) );
$this_container.show();
// focus on shown control
$('input:first, textarea:first', $this_container).focus();
// remember last used language
$main_control.data('PrevLanguage', $this_language);
}
$event.preventDefault();
}
);
}
);
}
$i++;
}
}
MultiLanguageSelector.prototype.inputForLanguage = function ($control_id, $language_id) {
return $control_id.replace('l' + this._currentLanguage + '_', 'l' + $language_id + '_');
}
MultiLanguageSelector.prototype.registerControl = function ($id) {
this._controls.push($id);
}
Index: branches/1.1.x/platform/designs/default_design.des.tpl
===================================================================
--- branches/1.1.x/platform/designs/default_design.des.tpl (revision 13750)
+++ branches/1.1.x/platform/designs/default_design.des.tpl (revision 13751)
@@ -1,128 +1,127 @@
<!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_PageInfo type="tracking"/>
<inp2:st_EditPage mode="end"/>
</body>
</html>
\ No newline at end of file
Index: branches/1.1.x/platform/elements/categories.elm.tpl
===================================================================
--- branches/1.1.x/platform/elements/categories.elm.tpl (revision 13750)
+++ branches/1.1.x/platform/elements/categories.elm.tpl (revision 13751)
@@ -1,106 +1,106 @@
<!--## CATEGORY ELEMENT ##-->
<inp2:m_DefineElement name="category_element">
<td style="width: <inp2:ColumnWidth/>">
<table>
<tr>
<td class="directory-icon">
<img src="<inp2:m_TemplatesBase module="In-Portal"/>img/directory_icon.gif" width="22" height="17" alt="" /><br />
</td>
<td class="directory-text">
<inp2:m_if check="IsCurrent">
<strong><inp2:Field name="Name"/></strong> (<inp2:m_phrase name="lu_SubCats"/>: <inp2:SubCatCount/>)
<inp2:m_else/>
<!--## CHECK IF CATEGORY IS SYM. LINK POINTING TO OTHER CATEGORY ##-->
<inp2:m_if check="IsCategorySymLink">
<a href="<inp2:CategoryLink template="__default__" m_cat_page="1"/>" class="text-title"><i><inp2:Field name="Name"/> @</i></a> <span class="item-statistics">(<!--## <inp2:m_phrase name="lu_SubCats"/>: ##--><inp2:SubCatCount/> / <inp2:ItemCount/>)</span>
<inp2:m_else/>
<a href="<inp2:CategoryLink template="__default__" m_cat_page="1"/>" class="text-title"><inp2:Field name="Name"/></a> <span class="item-statistics">(<!--## <inp2:m_phrase name="lu_SubCats"/>: ##--><inp2:SubCatCount/> / <inp2:ItemCount/>)</span>
</inp2:m_if>
<!--## /CHECK IF CATEGORY IS SYM. LINK POINTING TO OTHER CATEGORY ##-->
</inp2:m_if>
<inp2:m_if check="Field" name="IsNew"><img src="<inp2:m_TemplatesBase module="In-Portal"/>img/icon_new.gif" alt="<inp2:m_Phrase name="lu_New" no_editing="1"/>"/></inp2:m_if>
<inp2:m_if check="IsEditorsPick"><img src="<inp2:m_TemplatesBase module="In-Portal"/>img/icon_pick.gif" alt="<inp2:m_Phrase name="lu_Pick" no_editing="1"/>"/></inp2:m_if>
<br />
<img src="<inp2:m_TemplatesBase module="In-Portal"/>img/s.gif" width="1" height="4" alt="" /><br />
<inp2:Field name="Description" first_chars="200"/>
<inp2:m_if check="m_Param" name="show_relevance">
<br/>
<inp2:m_if check="Field" name="Description"><br/></inp2:m_if>
<inp2:RelevanceIndicator on_color="Red" off_color="White" relevance_normal_render_as="search_relevance_normal" relevance_full_render_as="search_relevance_full" />
</inp2:m_if>
</td>
</tr>
</table>
</td>
</inp2:m_DefineElement>
<!--## /CATEGORY ELEMENT ##-->
<!--## NO CATEGORIES ELEMENT ##-->
<inp2:m_DefineElement name="no_categories">
<inp2:m_phrase name="lu_NoCategories"/>
</inp2:m_DefineElement>
<!--## /NO CATEGORIES ELEMENT ##-->
<!--## NO CATEGORIES ELEMENT ##-->
<inp2:m_DefineElement name="related_category_element">
<!--## CHECK IF CATEGORY IS SYM. LINK POINTING TO OTHER CATEGORY ##-->
<li>
<inp2:m_if check="IsCategorySymLink">
<a href="<inp2:CategoryLink template="__default__" m_cat_page="1"/>" class="text-title"><i><inp2:Field name="Name"/> @</i></a>
<inp2:m_else/>
<a href="<inp2:CategoryLink template="__default__" m_cat_page="1"/>" class="text-title"><inp2:Field name="Name"/></a>
</inp2:m_if>
</li>
<!--## /CHECK IF CATEGORY IS SYM. LINK POINTING TO OTHER CATEGORY ##-->
</inp2:m_DefineElement>
<!--## /NO CATEGORIES ELEMENT ##-->
<inp2:m_DefineElement name="selector_category_element">
- <option value="<inp2:m_Param name="category_id"/>">
+ <option value="<inp2:m_Param name='category_id'/>" full_path="<inp2:m_Param name='full_path' html_escape='1'/>">
<inp2:m_Param name="separator"/><inp2:m_Param name="category_name"/>
</option>
</inp2:m_DefineElement>
<inp2:m_DefineElement name="more_category_element">
<tr id="category_<inp2:m_Param name="category_id"/>">
<td>
- <inp2:m_Param name="category_name"/>
+ <inp2:m_Param name="full_path"/>
</td>
<td>
<input type="button" class="delete-button" value="<inp2:m_Phrase label="lu_btn_Delete" no_editing="1"/>" onclick="$ItemCategories.DeleteCategory(<inp2:m_Param name="category_id"/>);"/>
</td>
</tr>
</inp2:m_DefineElement>
<!--## SITEMAP ELEMENTS ##-->
<inp2:m_DefineElement name="more_link_elem">
<li>
<a href="<inp2:c_CategoryLink template='__default__' m_cat_page='1'/>" class="sub-category"><inp2:m_Phrase label="lu_more"/>...</a>
</li>
</inp2:m_DefineElement>
<inp2:m_DefineElement name="sitemap_category_element" level_var="sitemap_level" max_levels="0">
<li>
<a href="<inp2:CategoryLink template='__default__' m_cat_page='1'/>" class="sub-category"><inp2:Field name="Name" html_escape="1"/></a>
<inp2:m_ifnot check="m_Get" name="$level_var" equals_to="$max_levels">
<inp2:InitList requery="1" per_page="50"/>
<inp2:m_if check="TotalRecords">
<ul>
<inp2:m_Inc param="$level_var" by="1"/>
<inp2:PrintList render_as="sitemap_category_element" max_levels="$max_levels" more_link_render_as="more_link_elem"/>
</ul>
</inp2:m_if>
</inp2:m_ifnot>
</li>
</inp2:m_DefineElement>
<!--## //SITEMAP ELEMENTS ##-->
Index: branches/1.1.x
===================================================================
--- branches/1.1.x (revision 13750)
+++ branches/1.1.x (revision 13751)
Property changes on: branches/1.1.x
___________________________________________________________________
Modified: svn:mergeinfo
## -0,0 +0,2 ##
Merged /themes/advanced/branches/1.0.x:r13501-13699
Merged /themes/advanced/releases/1.0.2:r13700-13750
Event Timeline
Log In to Comment