Updated to XenForo 2.2

upload/src/addons/nick97/ResourceIconInSearchResults/_data/options.xml → _data/activity_summary_definitions.xml

@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="utf-8"?>
-<options/>
+<activity_summary_definitions/>

_data/options.xml

@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+<options>
+  <option option_id="xf_nick97_enable_search_tabs" edit_format="onoff" data_type="boolean">
+    <default_value>1</default_value>
+    <relation group_id="searchOptions" display_order="50"/>
+  </option>
+  <option option_id="xf_nick97_enable_search_text_box" edit_format="onoff" data_type="boolean">
+    <default_value>1</default_value>
+    <relation group_id="searchOptions" display_order="40"/>
+  </option>
+  <option option_id="xfrm_latest_resources" edit_format="onoff" data_type="boolean">
+    <default_value>1</default_value>
+    <relation group_id="xfrm" display_order="2"/>
+  </option>
+  <option option_id="xfrm_nick97_enable_featured_resources" edit_format="onoff" data_type="boolean">
+    <default_value>1</default_value>
+    <relation group_id="xfrm" display_order="1100"/>
+  </option>
+  <option option_id="xfrm_resources_views" edit_format="onoff" data_type="boolean">
+    <default_value>1</default_value>
+    <relation group_id="xfrm" display_order="1"/>
+  </option>
+</options>

_data/phrases.xml

@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<phrases>
+  <phrase title="option.xf_nick97_enable_search_tabs" version_id="2011000" version_string="2.2.0"><![CDATA[Enable Search Tabs]]></phrase>
+  <phrase title="option.xf_nick97_enable_search_text_box" version_id="2011000" version_string="2.2.0"><![CDATA[Enable Search Textbox]]></phrase>
+  <phrase title="option.xfrm_latest_resources" version_id="2011000" version_string="2.2.0"><![CDATA[Enable Latest Resources]]></phrase>
+  <phrase title="option.xfrm_nick97_enable_featured_resources" version_id="2011000" version_string="2.2.0"><![CDATA[Enable Featured Resources]]></phrase>
+  <phrase title="option.xfrm_resources_views" version_id="2011000" version_string="2.2.0"><![CDATA[Enable Resources View]]></phrase>
+  <phrase title="option_explain.xf_nick97_enable_search_tabs" version_id="2011000" version_string="2.2.0"><![CDATA[Enable search tabs in search results and tag results]]></phrase>
+  <phrase title="option_explain.xf_nick97_enable_search_text_box" version_id="2011000" version_string="2.2.0"><![CDATA[Enable search textbox in search results and tag results]]></phrase>
+  <phrase title="option_explain.xfrm_latest_resources" version_id="2011000" version_string="2.2.0"><![CDATA[This will enable Latest Resources In Search Results]]></phrase>
+  <phrase title="option_explain.xfrm_nick97_enable_featured_resources" version_id="2011000" version_string="2.2.0"><![CDATA[Enable featured resources in search results and tag results]]></phrase>
+  <phrase title="option_explain.xfrm_resources_views" version_id="2011000" version_string="2.2.0"><![CDATA[Enable resources view in search results and tag results]]></phrase>
+  <phrase title="style_prop.enable_resourceicon" version_id="2010000" version_string="2.1.0"><![CDATA[Enable Resources Icon]]></phrase>
+  <phrase title="style_prop_desc.enable_resourceicon" version_id="2010000" version_string="2.1.0"><![CDATA[If you installed xenmax resource icon]]></phrase>
+  <phrase title="style_prop_group.nick97_resourceiconinsearch" version_id="2010000" version_string="2.1.0"><![CDATA[[NICK97] Resources Icon In Search Results]]></phrase>
+  <phrase title="style_prop_group_desc.nick97_resourceiconinsearch" version_id="2010000" version_string="2.1.0"><![CDATA[Size, Color, background and more options that fit your needs]]></phrase>
+</phrases>

upload/src/addons/nick97/ResourceIconInSearchResults/_data/template_modifications.xml → _data/template_modifications.xml

@@ -1,13 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <template_modifications>
-  <modification type="public" template="PAGE_CONTAINER" modification_key="xs_copyright_footer" description="Add copyright footer" execution_order="10" enabled="0" action="str_replace">
+  <modification type="public" template="PAGE_CONTAINER" modification_key="xs_copyright_footer" description="Add copyright information." execution_order="10" enabled="0" action="str_replace">
     <find><![CDATA[{{ phrase('extra_copyright') }}]]></find>
     <replace><![CDATA[$0  <a href="https://cities-mods.com/" class="u-concealed" dir="ltr" target="_blank" style="font-size: 0;">Xenforo Add-ons and Styles<span class="copyright"> by GameNet</span></a>]]></replace>
   </modification>
-  <modification type="public" template="search_result_resource" modification_key="search_result_resource" description="fix Resource Icon size (This is if you install XenMax Resource Icon)" execution_order="40" enabled="1" action="str_replace">
-    <find><![CDATA[{{ resource_icon($resource, 's', link('resources', $resource)) }}]]></find>
-    <replace><![CDATA[{{ xm_icon($resource, 's', link('resources', $resource)) }}]]></replace>
-  </modification>
   <modification type="public" template="search_result_resource" modification_key="xm_resouceiconinsearch" description="Replace resource icon instead of avatar" execution_order="20" enabled="1" action="str_replace">
     <find><![CDATA[<li class="block-row block-row--separated {{ $resource.isIgnored() ? 'is-ignored' : '' }} js-inlineModContainer" data-author="{{ $resource.User.username ?: $resource.username }}">
 	<div class="contentRow {{ !$resource.isVisible() ? 'is-deleted' : '' }}">
@@ -32,6 +28,14 @@
 					<li><xf:username user="{$resource.User}" defaultname="{$resource.username}" /></li>
 					<li>{{ phrase('xfrm_resource') }}</li>
 					<li><xf:date time="{$resource.resource_date}" /></li>
+					<xf:if is="$xf.options.enableTagging && $resource.tags">
+						<li>
+							<xf:macro template="tag_macros" name="simple_list"
+								arg-tags="{$resource.tags}"
+								arg-containerClass="contentRow-minor"
+								arg-highlightTerm="{{ $options.tag ?: $options.term}}" />
+						</li>
+					</xf:if>
 					<li>{{ phrase('category:') }} <a href="{{ link('resources/categories', $resource.Category) }}">{$resource.Category.title}</a></li>
 				</ul>
 			</div>
@@ -44,7 +48,7 @@
 		<div class="structItem-cell structItem-cell--icon structItem-cell--iconExpanded">
 			<div class="structItem-iconContainer">
 				<xf:if is="$xf.options.xfrmAllowIcons">
-					{{ resource_icon($resource, 's', link('resources', $resource)) }}
+					{{ xm_icon($resource, 's', link('resources', $resource)) }}
 				<xf:avatar user="$resource.User" size="s"
 					href=""
 					class="avatar--separated structItem-secondaryIcon" />
@@ -190,11 +194,7 @@
 		</div>
 	</div>]]></replace>
   </modification>
-  <modification type="public" template="search_result_resource_update" modification_key="search_result_resource_update" description="fix Resource Icon size (This is if you install XenMax Resource Icon)" execution_order="50" enabled="1" action="str_replace">
-    <find><![CDATA[{{ resource_icon($resource, 's', link('resources', $resource)) }}]]></find>
-    <replace><![CDATA[{{ xm_icon($resource, 's', link('resources', $resource)) }}]]></replace>
-  </modification>
-  <modification type="public" template="search_result_resource_update" modification_key="xm_resouceiconinsearch_update" description="Add resource icon instead of avatar (Updates)" execution_order="30" enabled="1" action="str_replace">
+  <modification type="public" template="search_result_resource_update" modification_key="xm_resouceiconinsearch_update" description="Replace resource icon instead of avatar (Updates)" execution_order="30" enabled="1" action="str_replace">
     <find><![CDATA[<li class="block-row block-row--separated {{ $resource.isIgnored() ? 'is-ignored' : '' }} js-inlineModContainer" data-author="{{ $resource.User.username ?: $resource.username }}">
 	<div class="contentRow {{ !$update.isVisible() ? 'is-deleted' : '' }}">
 		<span class="contentRow-figure">
@@ -224,7 +224,7 @@
 		<div class="structItem-cell structItem-cell--icon structItem-cell--iconExpanded">
 			<div class="structItem-iconContainer">
 				<xf:if is="$xf.options.xfrmAllowIcons">
-					{{ resource_icon($resource, 's', link('resources', $resource)) }}
+					{{ xm_icon($resource, 's', link('resources', $resource)) }}
 				<xf:avatar user="$resource.User" size="s"
 					href=""
 					class="avatar--separated structItem-secondaryIcon" />
@@ -370,7 +370,7 @@
 		</div>
 	</div>]]></replace>
   </modification>
-  <modification type="public" template="xfrm_resource_list_macros" modification_key="xm_resource_view" description="Add resource view in search results" execution_order="15" enabled="1" action="str_replace">
+  <modification type="public" template="xfrm_resource_list_macros" modification_key="xm_resource_view" description="Add resource view count in resource list" execution_order="15" enabled="1" action="str_replace">
     <find><![CDATA[<dl class="pairs pairs--justified structItem-minor structItem-metaItem structItem-metaItem--downloads">
 					<dt>{{ phrase('xfrm_downloads') }}</dt>
 					<dd>{$resource.download_count|number}</dd>
@@ -388,12 +388,4 @@
 </dl>
 </xen:if>]]></replace>
   </modification>
-  <modification type="public" template="xfrm_resource_wrapper_macros" modification_key="XFRM_FormatVersion" description="Adds the size and format of the file on the &quot;Download&quot; button" execution_order="10" enabled="1" action="preg_replace">
-    <find><![CDATA[{{ phrase('download') }}]]></find>
-    <replace><![CDATA[$0
-<xf:if is="count($resource.CurrentVersion.Attachments) == 1">
-  <xf:set var="$attachment" value="{{ $resource.CurrentVersion.Attachments|first }}" />
-  (<strong>{{ $attachment.getFileSize()|file_size }}</strong> / <em>{{ $attachment.getExtension() }}</em>)
-</xf:if>]]></replace>
-  </modification>
 </template_modifications>

addon.json

@@ -0,0 +1,22 @@
+{
+    "legacy_addon_id": "resource_icon_in_search",
+    "title": "[NICK97] Resource Icon In Search Results",
+    "description": "Add resource icon instead of avatar in search results and tag results",
+    "version_id": 2011000,
+    "version_string": "2.2.0",
+    "dev": "NICK97",
+    "dev_url": "https://gameplaycanada.weebly.com/",
+    "faq_url": "https://gameplaycanada.weebly.com/store/p338/%5BNICK97%5D_Resources_Icon_In_Search_Results_-_XF2.html#/",
+    "support_url": "https://cities-mods.com/support",
+    "extra_urls": {
+        "Gaming Community": "https://cities-mods.com",
+        "Donate": "https://www.cities-mods.com/donate/"
+    },
+    "require": {
+        "XFRM": [
+            2020070,
+            "XenForo Resource Manager 2.2.0 +"
+        ]
+    },
+    "icon": "fa-search"
+}

upload/src/addons/nick97/ResourceIconInSearchResults/hashes.json → hashes.json

@@ -1,8 +1,9 @@
 {
-    "src/addons/nick97/ResourceIconInSearchResults/addon.json": "32346b42aba95ab47ee81d6b5c3f9d38ced55d54a95fdbadf5cdc83c3af3b03b",
+    "src/addons/nick97/ResourceIconInSearchResults/addon.json": "2c2d285b4f6dd5127ebc537a2ee9ad1aad03df6d3d5279811cdfa57f0b9c7ce3",
     "src/addons/nick97/ResourceIconInSearchResults/icon.png": "524421aa05b851ee4e04aaad875fc8bf0cfc94df970765f9600929b2525b43a7",
-    "src/addons/nick97/ResourceIconInSearchResults/install-upgrade.json": "928e76158653ce102871fb32dfedae9cbe160f18319e81a01aee417b064ba486",
+    "src/addons/nick97/ResourceIconInSearchResults/install-upgrade.json": "66bf196946a38b438737e28910173eb17f70e9f549803dbb88c32ab6ead7aece",
     "src/addons/nick97/ResourceIconInSearchResults/Setup.php": "4eaba49c70def84ae7c96141e4cfc14800393c18de735edc4f22d15d5d3e0e9e",
+    "src/addons/nick97/ResourceIconInSearchResults/_data/activity_summary_definitions.xml": "99d8c2563a31320d66f958fc8bda78613545f5f7959bb3cf5318805e3a3c39d2",
     "src/addons/nick97/ResourceIconInSearchResults/_data/admin_navigation.xml": "064ec797484ac00d5ee37367b50b06846d11f480d00550997712707f8fdac8c0",
     "src/addons/nick97/ResourceIconInSearchResults/_data/admin_permission.xml": "ec6fb97cebf0bceb24f1ed1d5778c1db54eeb7535fbb3e31d824840e7aa9ff87",
     "src/addons/nick97/ResourceIconInSearchResults/_data/advertising_positions.xml": "d2f7cbe844bb1df3cf878d22ff6306249245c8ff6b0b87b9b729744bec538261",
@@ -17,16 +18,16 @@
     "src/addons/nick97/ResourceIconInSearchResults/_data/help_pages.xml": "a8a0c0b06cdc550438bc8a8d385af3e1e5ab3459877dfb934c1c31be59c89163",
     "src/addons/nick97/ResourceIconInSearchResults/_data/member_stats.xml": "89fb2b93ff1eca7a1f6f752248edf6090dfd24037db1446fd18ff7143f08124d",
     "src/addons/nick97/ResourceIconInSearchResults/_data/navigation.xml": "f75e1c03a45a360bbdfcd0567121665082315068475d5b0feb8b1acbb1688651",
-    "src/addons/nick97/ResourceIconInSearchResults/_data/options.xml": "1cea29aa5671733d85c8fc6f7c66128eacbca5643cbb38585eb82002879b51a4",
+    "src/addons/nick97/ResourceIconInSearchResults/_data/options.xml": "8ae9aeb313ba2e6691e04970befcb15835266c1729f7f49b89365d0879a36e25",
     "src/addons/nick97/ResourceIconInSearchResults/_data/option_groups.xml": "154d7a89664b243d0bd8227c22e241f934bf7e196c83230ee23d3c0c4fba1333",
     "src/addons/nick97/ResourceIconInSearchResults/_data/permissions.xml": "7e4fc7d5826733d15ea2d8936b9bdd41afcaad810eb38e50da3c8d8eafda1550",
     "src/addons/nick97/ResourceIconInSearchResults/_data/permission_interface_groups.xml": "3177224e96458b829aa7fb24866dda9e0455a4922aee3d669b53f59a1ffdf5d1",
-    "src/addons/nick97/ResourceIconInSearchResults/_data/phrases.xml": "f8c7843a576031efab32884dedc7215e1ee325e3b2a8f8542251580ee8e9b3e9",
+    "src/addons/nick97/ResourceIconInSearchResults/_data/phrases.xml": "03af5aca773bc34a1171769bb1066f0ec11a15cae54ff93628471110dbf0a449",
     "src/addons/nick97/ResourceIconInSearchResults/_data/routes.xml": "550fa64f9feedf137dd877b38c2684f94474619d2d83890dbb717a91b50da8f5",
     "src/addons/nick97/ResourceIconInSearchResults/_data/style_properties.xml": "cefc75309314c3cfac8084d9a62d72ad2f7ed45848b3aec679a18f41d2d32312",
     "src/addons/nick97/ResourceIconInSearchResults/_data/style_property_groups.xml": "366c9b0ca8b87b6f5bd048549a442594724c36b51c18d6050b8a5bc07301e07e",
     "src/addons/nick97/ResourceIconInSearchResults/_data/templates.xml": "e97235aae7ab1fa351775fedacdcee093d8cd82406b0a433bddb5e899d044bf6",
-    "src/addons/nick97/ResourceIconInSearchResults/_data/template_modifications.xml": "e5b7d70368752bbf973f3c4487229b5b96d9b01ab6ec9495404a2f60a8eaef21",
+    "src/addons/nick97/ResourceIconInSearchResults/_data/template_modifications.xml": "e3c4b685cbf0a3b0dcebfa3aa9cdfb8126314179bab19f2997eb1363cf3f32d1",
     "src/addons/nick97/ResourceIconInSearchResults/_data/widget_definitions.xml": "37e46965256430f24004c2e7f08ba08f9b0d1cbcc4d70e84b3f4e3ffb713e64b",
     "src/addons/nick97/ResourceIconInSearchResults/_data/widget_positions.xml": "a29cee66134f6bc5d75ed9df1eef21096c24401915c5b5c774389c3d7bb2d5b3"
 }

install-upgrade.json

@@ -0,0 +1,6 @@
+{
+    "download_url": "https://cities-mods.com/xlex/nick97-resources-icon-in-search-results-xf2.223/download",
+    "extra": {
+        "product_id": 2011000
+    }
+}