diff --git a/applications/blog/data/javascript.xml b/applications/blog/data/javascript.xml index 1674c016..8942fa70 100644 --- a/applications/blog/data/javascript.xml +++ b/applications/blog/data/javascript.xml @@ -1,6 +1,6 @@ - - {{#lang}}manage_cats_new_row{{/lang}}\ +
    • \ "); ips.templates.set('blog.view.categoryRow', "\ @@ -287,13 +287,13 @@ ips.templates.set('blog.view.categoryRow', "\ \
    \ {{name}}\ - \ - {{#lang}}save{{/lang}}\ - {{#lang}}cancel{{/lang}}\ + \ + \ + \
    \
    \ - \ - \ + \
    \ \ "); diff --git a/applications/blog/data/lang.xml b/applications/blog/data/lang.xml index 804132ed..d279506f 100644 --- a/applications/blog/data/lang.xml +++ b/applications/blog/data/lang.xml @@ -1,6 +1,6 @@ - + Blogs Blogs a comment on a blog entry diff --git a/applications/blog/data/theme.xml b/applications/blog/data/theme.xml index 9fe8036c..dac7e776 100644 --- a/applications/blog/data/theme.xml +++ b/applications/blog/data/theme.xml @@ -670,21 +670,17 @@ {{endif}} {{if \count( $elements ) > 1}}

    {lang="entry_information"}

    -
    -
      + +
      {{foreach $elements as $name => $content}} -
    • - - {lang="$name"} - -
      • + {{endforeach}} -
    +
    {template="tabScrollers" app="core" group="global" location="global"} - -
    + +
    {{foreach $elements as $name => $contents}} -
    +
      {{foreach $contents as $inputName => $input}} {$input|raw} diff --git a/applications/blog/data/versions.json b/applications/blog/data/versions.json index 9e38f4d6..cd12cedb 100644 --- a/applications/blog/data/versions.json +++ b/applications/blog/data/versions.json @@ -279,5 +279,6 @@ "5000027": "5.0.0 Beta 2", "5000028": "5.0.0 Beta 2", "5000029": "5.0.0 Beta 3", - "5000030": "5.0.0 Beta 4" + "5000030": "5.0.0 Beta 4", + "5000031": "5.0.0 Beta 5" } \ No newline at end of file diff --git a/applications/blog/setup/upg_5000031/data.json b/applications/blog/setup/upg_5000031/data.json new file mode 100644 index 00000000..a8474872 --- /dev/null +++ b/applications/blog/setup/upg_5000031/data.json @@ -0,0 +1,22 @@ +{ + "id": 5000031, + "name": "5.0.0 Beta 5", + "steps": { + "queries": false, + "lang": false, + "theme": true, + "themeeditor": true, + "javascript": true, + "emailTemplates": false, + "acpSearchKeywords": false, + "settings": false, + "tasks": false, + "modules": false, + "widgets": false, + "customOptions": false, + "customRoutines": false + }, + "forceMainUpgrader": false, + "forceManualDownloadNoCiC": false, + "forceManualDownloadCiC": false +} \ No newline at end of file diff --git a/applications/blog/setup/upg_5000031/javascript.json b/applications/blog/setup/upg_5000031/javascript.json new file mode 100644 index 00000000..7c12eaa2 --- /dev/null +++ b/applications/blog/setup/upg_5000031/javascript.json @@ -0,0 +1,15 @@ +{ + "files": { + "added": [], + "edited": [ + "blog\/front\/controllers\/view\/ips.view.manageCategories.js", + "blog\/front\/templates\/ips.templates.view.js" + ], + "removed": [] + }, + "orders": { + "added": [], + "edited": [], + "removed": [] + } +} \ No newline at end of file diff --git a/applications/blog/setup/upg_5000031/theme.json b/applications/blog/setup/upg_5000031/theme.json new file mode 100644 index 00000000..c3d79b2e --- /dev/null +++ b/applications/blog/setup/upg_5000031/theme.json @@ -0,0 +1,19 @@ +{ + "html": { + "added": [], + "edited": [ + "front\/submit\/submitFormTemplate" + ], + "removed": [] + }, + "css": { + "added": [], + "edited": [], + "removed": [] + }, + "resources": { + "added": [], + "edited": [], + "removed": [] + } +} \ No newline at end of file diff --git a/applications/blog/setup/upg_5000031/themeeditor.json b/applications/blog/setup/upg_5000031/themeeditor.json new file mode 100644 index 00000000..6493d217 --- /dev/null +++ b/applications/blog/setup/upg_5000031/themeeditor.json @@ -0,0 +1,14 @@ +{ + "categories": { + "added": [], + "edited": [], + "removed": [] + }, + "settings": { + "added": [], + "edited": [ + "layout_blog_view" + ], + "removed": [] + } +} \ No newline at end of file diff --git a/applications/calendar/data/javascript.xml b/applications/calendar/data/javascript.xml index 3d21bdfe..8190ec10 100644 --- a/applications/calendar/data/javascript.xml +++ b/applications/calendar/data/javascript.xml @@ -1,6 +1,6 @@ - - - - - - - - - /** + /** * Invision Community * (c) Invision Power Services, Inc. - https://www.invisioncommunity.com * @@ -2113,7 +2113,7 @@ var PER_PAGE = 16; }); }(jQuery, _)); -
    \ ");]]> -
    diff --git a/applications/calendar/data/lang.xml b/applications/calendar/data/lang.xml index 960b20a2..f458e127 100644 --- a/applications/calendar/data/lang.xml +++ b/applications/calendar/data/lang.xml @@ -1,6 +1,6 @@ - + Events Events a comment on an event diff --git a/applications/calendar/data/theme.xml b/applications/calendar/data/theme.xml index da83c1f9..0879f28d 100644 --- a/applications/calendar/data/theme.xml +++ b/applications/calendar/data/theme.xml @@ -348,7 +348,7 @@ {{endif}}
    - {{if $event->nextOccurrence( \IPS\calendar\Date::getDate(), 'startDate' )}} + {{if $event->nextOccurrence( $date, 'startDate' )}} {lang="_date_month_short" pluralize="$event->nextOccurrence( $date, 'startDate' )->format( 'n' )"} {$event->nextOccurrence( $date, 'startDate' )->format( 'd' )} {{else}} @@ -459,7 +459,7 @@ {{endif}} {{endif}}
    -

    {$event->title}

    +

    {$event->title}

    {$event->truncated(TRUE, 400)}

    {{if $event->container()->club() !== NULL || $event->venue || $event->location}} @@ -489,7 +489,7 @@ {{if \count( $featured )}}
    -

    Featured Events

    +

    Featured Events

    {template="carouselNavigation" group="global" app="core" params="'carousel--events-featured'"}
    @@ -510,7 +510,7 @@ {{$image = \IPS\File::get('core_Clubs', $event->container()->club()->profile_photo );}} {{endif}} -
    +
  • {{if $image}} @@ -533,9 +533,9 @@ {{if $event->_happening}}
    {$event->_happening}
    {{endif}} -

    +

    {$event->title} -

    +

    • -
    ]]> +]]> @@ -1857,7 +1864,7 @@ {template="shareButton" app="core" group="sharelinks" params="$event"} {{endif}} {{if $event->canRemind()}} - {template="reminder" app="calendar" group="view" params="$event, $reminder"} + {template="reminder" app="calendar" group="view" params="$event, $event->getReminder()"} {{endif}} {{if \IPS\Application::appIsEnabled('cloud')}} {template="spam" app="cloud" group="spam" params="$event"} @@ -2072,24 +2079,18 @@
    {template="rsvpControls" group="view" params="$event, $attendees"}

    {lang="event_rsvp_attendees"}

    -
    - + + {{endif}} + +
    {template="tabScrollers" app="core" group="global" location="global"} -
    -
    -
    + +
    +
    {{if \count($attendees[1]) }}
      {{foreach $attendees[1] as $attendee}} @@ -2115,7 +2116,7 @@ {{endif}}
    {{if $event->rsvp_limit == -1}} -
    + {{endif}} -
    + -
    + +
    {{foreach $elements as $name => $contents}} -
    +
    {{if $hasModOptions && ( $name == 'topic_mainTab' OR $name == 'content_record_form_mainTab' ) }}
    @@ -1515,21 +1512,20 @@ data-view-tracking-data="{expression="base64_encode(json_encode( $review->getVie {{if !empty( $errorTabs )}}

    {lang="tab_error"}

    {{endif}} -
    -
      + +
      + {{$checkedTab = NULL;}} {{foreach $elements as $name => $content}} -
    • - - {lang="$name"} - -
      • + {{endforeach}} -
    +
    {template="tabScrollers" app="core" group="global" location="global"} -
    -
    + +
    {{foreach $elements as $name => $contents}} -
    +
    {{if $hasModOptions && ( $name == 'topic_mainTab' OR $name == 'content_record_form_mainTab' ) }}
    diff --git a/applications/cms/data/javascript.xml b/applications/cms/data/javascript.xml index 3dba7dbb..cb179916 100644 --- a/applications/cms/data/javascript.xml +++ b/applications/cms/data/javascript.xml @@ -1,6 +1,6 @@ - - - /** + /** * Invision Community * (c) Invision Power Services, Inc. - https://www.invisioncommunity.com * @@ -156,7 +156,7 @@ } }); }(jQuery, _)); - - - - - - - - /** + /** * Invision Community * (c) Invision Power Services, Inc. - https://www.invisioncommunity.com * @@ -1421,7 +1420,7 @@ } }); }(jQuery, _)); - /** + /** * Invision Community * (c) Invision Power Services, Inc. - https://www.invisioncommunity.com * @@ -1471,7 +1470,7 @@ } }); }(jQuery, _)); - /** + /** * Invision Community * (c) Invision Power Services, Inc. - https://www.invisioncommunity.com * @@ -1543,7 +1542,7 @@ } }); }(jQuery, _)); - ul'); + this._tabBar = this.scope.find('#elTemplateEditor_tabbar [role="tablist"]'); this._tabContent = this.scope.find('#elTemplateEditor_panels'); // Get the current height of the tab bar @@ -2168,7 +2167,7 @@ } // Is this tab active? - var active = tab.hasClass('ipsTabs__tab--active'); + var active = (tab.attr('aria-selected') === 'true'); // Let the document know what we're up to this.trigger( 'closedTab.templates', { @@ -2188,7 +2187,7 @@ } if( newTab ){ - newTab.find('> a').click(); + newTab.click(); } // Close the tab @@ -2281,7 +2280,7 @@ if( !this._tabBar.find('[data-fileid="' + data.meta.key + '"]').length ){ this._buildTab( data.meta ); } else { - this._tabBar.find('[data-fileid="' + data.meta.key + '"] > a').click(); + this._tabBar.find('[data-fileid="' + data.meta.key + '"]').click(); } }, @@ -2323,7 +2322,7 @@ this._recalculatePanelWrapper(); // Toggle the new tab - this._tabBar.find('[data-fileid="' + meta.key + '"] > a').click(); + this._tabBar.find('[data-fileid="' + meta.key + '"]').click(); // Manually set the content area to loading since we aren't using ui.tabbar's load methods this._tabContent.addClass('ipsLoading ipsTabs_loadingContent'); @@ -2357,9 +2356,9 @@ */ _updateTabLabel: function( key, title ) { - var span = this._tabBar.find('[data-fileid="' + key + '"] > a span').clone(); + var span = this._tabBar.find('[data-fileid="' + key + '"] span').clone(); - this._tabBar.find('[data-fileid="' + key + '"] > a').html( title ).append( span ); + this._tabBar.find('[data-fileid="' + key + '"]').html( title ).append( span ); }, /** @@ -2474,7 +2473,7 @@ tabPanel: null }; - var tab = this._tabBar.find('.ipsTabs__tab.ipsTabs__tab--active').first().parent(); + var tab = this._tabBar.find('[aria-selected="true"]').first(); if( !tab.length ){ return toReturn; @@ -2504,7 +2503,7 @@ } }); }(jQuery, _));]]> - - - /** + /** * Invision Community * (c) Invision Power Services, Inc. - https://www.invisioncommunity.com * @@ -3010,7 +3009,7 @@ } }); }(jQuery, _)); - \ {{{contents}}}\ \ @@ -3027,16 +3026,14 @@ ips.templates.set( 'templates.media.noSearchResults', "\ {{#lang}}mediaNoResults{{/lang}}\
    \ ");]]> - \ - {{title}} \ - \ + {{title}} \ "); ips.templates.set('templates.editor.tabPanel', " \ - -
    - + +
    + + +
    {template="tabScrollers" app="core" group="global" location="global"} -
    +
    -
    +
    {{$roots = \call_user_func( $tree->getRoots );}}
    • @@ -408,7 +404,7 @@
    -
    +