Skip to content

Collapsible blocks tweaks #76

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
torarnv wants to merge 8 commits into
base: master
Choose a base branch
from
Open

Collapsible blocks tweaks #76

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
902c40c
Fix build warnings about encoding not being set
torarnv Mar 27, 2020
ecfe209
Fix build warning about duplicated plugin configuration
torarnv Mar 27, 2020
56a690f
Prevent spring scanner from scanning itself, which produces warnings
torarnv Mar 27, 2020
6663d20
Update to AMPS 8.0.2
torarnv Mar 29, 2020
445e603
Remove manual quickreload configuration
torarnv Mar 29, 2020
c63fa4a
Disable Google Analytics tracking during build
torarnv Jun 3, 2020
585c6aa
Fix missing twixie class on collapsable blocks
torarnv Jun 3, 2020
57efcae
Use AUI icons instead of twixi icons
torarnv Jun 3, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
36 changes: 8 additions & 28 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -184,23 +184,16 @@
<plugins>
<plugin>
<groupId>com.atlassian.maven.plugins</groupId>
<artifactId>maven-jira-plugin</artifactId>
<artifactId>jira-maven-plugin</artifactId>
<version>${amps.version}</version>
<extensions>true</extensions>
<configuration>
<productVersion>${jira.version}</productVersion>
<productDataVersion>${jira.version}</productDataVersion>
<log4jProperties>src/aps/resources/log4j.properties</log4jProperties>
<enableFastdev>false</enableFastdev>

<pluginArtifacts>
<pluginArtifact>
<groupId>com.atlassian.labs.plugins</groupId>
<artifactId>quickreload</artifactId>
<version>${quick.reload.version}</version>
</pluginArtifact>
</pluginArtifacts>

<enableQuickReload>true</enableQuickReload>
<allowGoogleTracking>false</allowGoogleTracking>
<products>
<product>
<id>jira</id>
Expand All @@ -209,13 +202,6 @@
</products>
</configuration>
</plugin>
<plugin>
<artifactId>maven-compiler-plugin</artifactId>
<configuration>
<source>1.7</source>
<target>1.7</target>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-release-plugin</artifactId>
Expand Down Expand Up @@ -248,34 +234,28 @@
</dependency>
</scannedDependencies>
<verbose>false</verbose>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<configuration>
<source>1.8</source>
<target>1.8</target>
<includeExclude>-com.atlassian.plugin.spring.scanner.annotation.*</includeExclude>
</configuration>
</plugin>
</plugins>
</build>

<properties>
<jira.version>7.2.0</jira.version>
<amps.version>6.2.6</amps.version>
<amps.version>8.0.2</amps.version>
<plugin.testrunner.version>1.2.3</plugin.testrunner.version>
<atlassian.spring.scanner.version>1.2.13</atlassian.spring.scanner.version>
<atlassian.plugin.key>${project.groupId}.${project.artifactId}</atlassian.plugin.key>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<testkit.version>6.3.11</testkit.version>
<quick.reload.version>1.30.5</quick.reload.version>

<jira.test.version>7.2.0</jira.test.version>
<jira.data.version>7.2.0</jira.data.version>
<jira.rest.version>3.0.8</jira.rest.version>
<atlas.template.version>3.0.0</atlas.template.version>
<atlas.concurrent.version>3.0.0</atlas.concurrent.version>
<atlas.sal.version>3.0.5</atlas.sal.version>
<maven.compiler.source>1.8</maven.compiler.source>
<maven.compiler.target>1.8</maven.compiler.target>
</properties>

<profiles>
Expand Down
6 changes: 3 additions & 3 deletions src/main/resources/templates/gerrit-reviews-agile-panel.vm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,15 +92,15 @@
<div class="twixi-block collapsed">
<div class="twixi-wrap concise">
<a href="#" class="twixi">
<span class="icon twixi-closed">
<span class="icon-default aui-icon aui-icon-small aui-iconfont-collapsed">
<span>Show</span>
</span>
</a>
$i18n.getText("gerrit-reviews-side-panel.closed_reviews", $numClosed)
</div>

<div class="verbose">
<span class="twixi icon twixi-opened">
<div class="twixi-wrap verbose">
<span class="twixi icon-default aui-icon aui-icon-small aui-iconfont-expanded">
<span>Hide</span>
</span>
<span>
Expand Down
6 changes: 3 additions & 3 deletions src/main/resources/templates/gerrit-reviews-side-panel.vm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,15 +92,15 @@
<div class="twixi-block collapsed">
<div class="twixi-wrap concise">
<a href="#" class="twixi">
<span class="icon twixi-closed">
<span class="icon-default aui-icon aui-icon-small aui-iconfont-collapsed">
<span>Show</span>
</span>
</a>
$i18n.getText("gerrit-reviews-side-panel.closed_reviews", $numClosed)
</div>

<div class="verbose">
<span class="twixi icon twixi-opened">
<div class="twixi-wrap verbose">
<span class="twixi icon-default aui-icon aui-icon-small aui-iconfont-expanded">
<span>Hide</span>
</span>
<span>
Expand Down
4 changes: 2 additions & 2 deletions src/main/resources/templates/gerrit-reviews-tabpanel-item.vm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@
## The concise version:
<div class="actionContainer twixi-wrap concise">
<a href="#" class="twixi">
<span class="icon twixi-closed">
<span class="icon-default aui-icon aui-icon-small aui-iconfont-collapsed">
<span>Show</span>
</span>
</a>
Expand All @@ -82,7 +82,7 @@
## The verbose version:
<div class="actionContainer twixi-wrap verbose">
<a href="#" class="twixi">
<span class="icon twixi-opened">
<span class="icon-default aui-icon aui-icon-small aui-iconfont-expanded">
<span>Hide</span>
</span>
</a>
Expand Down