Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
14 changes: 7 additions & 7 deletions .github/ISSUE_TEMPLATE/bug_report.md
Original file line number Diff line number Diff line change
@@ -1,9 +1,7 @@
---
name: Bug report
about: Thanks for helping us improve Peregrine CMS!
name: Bug report about: Thanks for helping us improve Peregrine CMS!
title: ''
labels: bug
assignees: ''
labels: bug assignees: ''

---

Expand All @@ -12,6 +10,7 @@ A clear and concise description of what the bug is.

**To Reproduce**
Steps to reproduce the behavior:

1. Go to '...'
2. Click on '....'
3. Scroll down to '....'
Expand All @@ -24,9 +23,10 @@ A clear and concise description of what you expected to happen.
If applicable, add screenshots to help explain your problem.

**Desktop (please complete the following information):**
- Browser [e.g. chrome, safari]
- Version [e.g. 22]
- OS: [e.g. iOS]

- Browser [e.g. chrome, safari]
- Version [e.g. 22]
- OS: [e.g. iOS]

**Additional context**
Add any other context about the problem here.
6 changes: 2 additions & 4 deletions .github/ISSUE_TEMPLATE/feature_request.md
Original file line number Diff line number Diff line change
@@ -1,9 +1,7 @@
---
name: Feature request
about: Thanks for helping us improve Peregrine CMS!
name: Feature request about: Thanks for helping us improve Peregrine CMS!
title: ''
labels: enhancement
assignees: ''
labels: enhancement assignees: ''

---

Expand Down
3 changes: 2 additions & 1 deletion core/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,8 @@
specific language governing permissions and limitations
under the License.
-->
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">

<modelVersion>4.0.0</modelVersion>

Expand Down
686 changes: 343 additions & 343 deletions core/src/main/java/com/themecleanflex/models/AccordionModel.java

Large diffs are not rendered by default.

419 changes: 211 additions & 208 deletions core/src/main/java/com/themecleanflex/models/BlockModel.java

Large diffs are not rendered by default.

614 changes: 309 additions & 305 deletions core/src/main/java/com/themecleanflex/models/BreadcrumbModel.java

Large diffs are not rendered by default.

199 changes: 100 additions & 99 deletions core/src/main/java/com/themecleanflex/models/CardModel.java
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
package com.themecleanflex.models;

import com.peregrine.model.api.ImageInfo;
import com.peregrine.nodetypes.models.AbstractComponent;
import com.peregrine.nodetypes.models.IComponent;
import org.apache.sling.api.resource.Resource;
Expand All @@ -9,8 +10,6 @@
import org.apache.sling.models.annotations.Model;

import javax.inject.Inject;

import com.peregrine.model.api.ImageInfo;
import java.awt.Dimension;


Expand Down Expand Up @@ -168,127 +167,129 @@

//GEN[:DEF
@Model(
adaptables = Resource.class,
resourceType = "themecleanflex/components/cards/cards",
defaultInjectionStrategy = DefaultInjectionStrategy.OPTIONAL,
adapters = IComponent.class
adaptables = Resource.class,
resourceType = "themecleanflex/components/cards/cards",
defaultInjectionStrategy = DefaultInjectionStrategy.OPTIONAL,
adapters = IComponent.class
)
@Exporter(
name = "jackson",
extensions = "json"
name = "jackson",
extensions = "json"
)

//GEN]
public class CardModel extends AbstractComponent {

public CardModel(final Resource r) { super(r); }
public CardModel(final Resource r) {
super(r);
}

//GEN[:INJECT
/* {"type":"string","x-source":"inject","x-form-label":"Card Title","x-form-visible":"model.showtitle == 'true'","x-form-type":"text"} */
@Inject
private String title;
/* {"type":"string","x-source":"inject","x-form-label":"Card Title","x-form-visible":"model.showtitle == 'true'","x-form-type":"text"} */
@Inject
private String title;

/* {"type":"string","x-source":"inject","x-form-label":"Card Text","x-form-visible":"model.showtext == 'true'","x-form-type":"texteditor"} */
@Inject
private String text;
/* {"type":"string","x-source":"inject","x-form-label":"Card Text","x-form-visible":"model.showtext == 'true'","x-form-type":"texteditor"} */
@Inject
private String text;

/* {"type":"string","x-source":"inject","x-form-label":"Card Image","x-form-type":"pathbrowser","x-form-browserRoot":"/content/themecleanflex/assets","x-annotate":"size"} */
@Inject
private String image;
/* {"type":"string","x-source":"inject","x-form-label":"Card Image","x-form-type":"pathbrowser","x-form-browserRoot":"/content/themecleanflex/assets","x-annotate":"size"} */
@Inject
private String image;

@Inject
@ImageInfo(name="image")
private Dimension imageSize;
@Inject
@ImageInfo(name = "image")
private Dimension imageSize;

/* {"type":"string","x-source":"inject","x-form-label":"Image Width","x-form-type":"materialrange","x-default":"100","x-form-min":"10","x-form-max":"100"} */
@Inject
@Default(values ="100")
private String imagewidth;
/* {"type":"string","x-source":"inject","x-form-label":"Image Width","x-form-type":"materialrange","x-default":"100","x-form-min":"10","x-form-max":"100"} */
@Inject
@Default(values = "100")
private String imagewidth;

/* {"type":"string","x-source":"inject","x-form-label":"Image Alt Text","x-form-type":"text"} */
@Inject
private String imagealttext;
/* {"type":"string","x-source":"inject","x-form-label":"Image Alt Text","x-form-type":"text"} */
@Inject
private String imagealttext;

/* {"type":"string","x-source":"inject","x-form-label":"Button Text","x-form-visible":"model.showbutton == 'true'","x-form-type":"text"} */
@Inject
private String buttontext;
/* {"type":"string","x-source":"inject","x-form-label":"Button Text","x-form-visible":"model.showbutton == 'true'","x-form-type":"text"} */
@Inject
private String buttontext;

/* {"type":"string","x-source":"inject","x-form-label":"Button Link","x-form-visible":"model.showbutton == 'true'","x-form-type":"pathbrowser","x-form-browserRoot":"/content/themecleanflex/pages"} */
@Inject
private String buttonlink;
/* {"type":"string","x-source":"inject","x-form-label":"Button Link","x-form-visible":"model.showbutton == 'true'","x-form-type":"pathbrowser","x-form-browserRoot":"/content/themecleanflex/pages"} */
@Inject
private String buttonlink;

/* {"type":"string","x-source":"inject","x-form-label":"Button Color","x-form-type":"materialselect","x-default":"primary","properties":{"primary":{"x-form-name":"Primary","x-form-value":"primary"},"secondary":{"x-form-name":"Secondary","x-form-value":"secondary"},"success":{"x-form-name":"Success","x-form-value":"success"},"danger":{"x-form-name":"Danger","x-form-value":"danger"},"warning":{"x-form-name":"Warning","x-form-value":"warning"},"info":{"x-form-name":"Info","x-form-value":"info"}}} */
@Inject
@Default(values ="primary")
private String buttoncolor;
/* {"type":"string","x-source":"inject","x-form-label":"Button Color","x-form-type":"materialselect","x-default":"primary","properties":{"primary":{"x-form-name":"Primary","x-form-value":"primary"},"secondary":{"x-form-name":"Secondary","x-form-value":"secondary"},"success":{"x-form-name":"Success","x-form-value":"success"},"danger":{"x-form-name":"Danger","x-form-value":"danger"},"warning":{"x-form-name":"Warning","x-form-value":"warning"},"info":{"x-form-name":"Info","x-form-value":"info"}}} */
@Inject
@Default(values = "primary")
private String buttoncolor;

/* {"type":"string","x-source":"inject","x-form-label":"Button Size","x-form-type":"materialselect","x-default":"default","properties":{"default":{"x-form-name":"Default","x-form-value":"default"},"large":{"x-form-name":"Large","x-form-value":"large"},"small":{"x-form-name":"Small","x-form-value":"small"}}} */
@Inject
@Default(values ="default")
private String buttonsize;
/* {"type":"string","x-source":"inject","x-form-label":"Button Size","x-form-type":"materialselect","x-default":"default","properties":{"default":{"x-form-name":"Default","x-form-value":"default"},"large":{"x-form-name":"Large","x-form-value":"large"},"small":{"x-form-name":"Small","x-form-value":"small"}}} */
@Inject
@Default(values = "default")
private String buttonsize;

/* {"type":"string","x-source":"inject","x-form-label":"Button Alignment","x-form-type":"materialselect","x-default":"center","properties":{"left":{"x-form-name":"Left","x-form-value":"left"},"center":{"x-form-name":"Center","x-form-value":"center"},"right":{"x-form-name":"Right","x-form-value":"right"}}} */
@Inject
@Default(values ="center")
private String buttonalign;
/* {"type":"string","x-source":"inject","x-form-label":"Button Alignment","x-form-type":"materialselect","x-default":"center","properties":{"left":{"x-form-name":"Left","x-form-value":"left"},"center":{"x-form-name":"Center","x-form-value":"center"},"right":{"x-form-name":"Right","x-form-value":"right"}}} */
@Inject
@Default(values = "center")
private String buttonalign;


//GEN]

//GEN[:GETTERS
/* {"type":"string","x-source":"inject","x-form-label":"Card Title","x-form-visible":"model.showtitle == 'true'","x-form-type":"text"} */
public String getTitle() {
return title;
}

/* {"type":"string","x-source":"inject","x-form-label":"Card Text","x-form-visible":"model.showtext == 'true'","x-form-type":"texteditor"} */
public String getText() {
return text;
}

/* {"type":"string","x-source":"inject","x-form-label":"Card Image","x-form-type":"pathbrowser","x-form-browserRoot":"/content/themecleanflex/assets","x-annotate":"size"} */
public String getImage() {
return image;
}

public Dimension getImageSize() {
return imageSize;
}

/* {"type":"string","x-source":"inject","x-form-label":"Image Width","x-form-type":"materialrange","x-default":"100","x-form-min":"10","x-form-max":"100"} */
public String getImagewidth() {
return imagewidth;
}

/* {"type":"string","x-source":"inject","x-form-label":"Image Alt Text","x-form-type":"text"} */
public String getImagealttext() {
return imagealttext;
}

/* {"type":"string","x-source":"inject","x-form-label":"Button Text","x-form-visible":"model.showbutton == 'true'","x-form-type":"text"} */
public String getButtontext() {
return buttontext;
}

/* {"type":"string","x-source":"inject","x-form-label":"Button Link","x-form-visible":"model.showbutton == 'true'","x-form-type":"pathbrowser","x-form-browserRoot":"/content/themecleanflex/pages"} */
public String getButtonlink() {
return buttonlink;
}

/* {"type":"string","x-source":"inject","x-form-label":"Button Color","x-form-type":"materialselect","x-default":"primary","properties":{"primary":{"x-form-name":"Primary","x-form-value":"primary"},"secondary":{"x-form-name":"Secondary","x-form-value":"secondary"},"success":{"x-form-name":"Success","x-form-value":"success"},"danger":{"x-form-name":"Danger","x-form-value":"danger"},"warning":{"x-form-name":"Warning","x-form-value":"warning"},"info":{"x-form-name":"Info","x-form-value":"info"}}} */
public String getButtoncolor() {
return buttoncolor;
}

/* {"type":"string","x-source":"inject","x-form-label":"Button Size","x-form-type":"materialselect","x-default":"default","properties":{"default":{"x-form-name":"Default","x-form-value":"default"},"large":{"x-form-name":"Large","x-form-value":"large"},"small":{"x-form-name":"Small","x-form-value":"small"}}} */
public String getButtonsize() {
return buttonsize;
}

/* {"type":"string","x-source":"inject","x-form-label":"Button Alignment","x-form-type":"materialselect","x-default":"center","properties":{"left":{"x-form-name":"Left","x-form-value":"left"},"center":{"x-form-name":"Center","x-form-value":"center"},"right":{"x-form-name":"Right","x-form-value":"right"}}} */
public String getButtonalign() {
return buttonalign;
}
/* {"type":"string","x-source":"inject","x-form-label":"Card Title","x-form-visible":"model.showtitle == 'true'","x-form-type":"text"} */
public String getTitle() {
return title;
}

/* {"type":"string","x-source":"inject","x-form-label":"Card Text","x-form-visible":"model.showtext == 'true'","x-form-type":"texteditor"} */
public String getText() {
return text;
}

/* {"type":"string","x-source":"inject","x-form-label":"Card Image","x-form-type":"pathbrowser","x-form-browserRoot":"/content/themecleanflex/assets","x-annotate":"size"} */
public String getImage() {
return image;
}

public Dimension getImageSize() {
return imageSize;
}

/* {"type":"string","x-source":"inject","x-form-label":"Image Width","x-form-type":"materialrange","x-default":"100","x-form-min":"10","x-form-max":"100"} */
public String getImagewidth() {
return imagewidth;
}

/* {"type":"string","x-source":"inject","x-form-label":"Image Alt Text","x-form-type":"text"} */
public String getImagealttext() {
return imagealttext;
}

/* {"type":"string","x-source":"inject","x-form-label":"Button Text","x-form-visible":"model.showbutton == 'true'","x-form-type":"text"} */
public String getButtontext() {
return buttontext;
}

/* {"type":"string","x-source":"inject","x-form-label":"Button Link","x-form-visible":"model.showbutton == 'true'","x-form-type":"pathbrowser","x-form-browserRoot":"/content/themecleanflex/pages"} */
public String getButtonlink() {
return buttonlink;
}

/* {"type":"string","x-source":"inject","x-form-label":"Button Color","x-form-type":"materialselect","x-default":"primary","properties":{"primary":{"x-form-name":"Primary","x-form-value":"primary"},"secondary":{"x-form-name":"Secondary","x-form-value":"secondary"},"success":{"x-form-name":"Success","x-form-value":"success"},"danger":{"x-form-name":"Danger","x-form-value":"danger"},"warning":{"x-form-name":"Warning","x-form-value":"warning"},"info":{"x-form-name":"Info","x-form-value":"info"}}} */
public String getButtoncolor() {
return buttoncolor;
}

/* {"type":"string","x-source":"inject","x-form-label":"Button Size","x-form-type":"materialselect","x-default":"default","properties":{"default":{"x-form-name":"Default","x-form-value":"default"},"large":{"x-form-name":"Large","x-form-value":"large"},"small":{"x-form-name":"Small","x-form-value":"small"}}} */
public String getButtonsize() {
return buttonsize;
}

/* {"type":"string","x-source":"inject","x-form-label":"Button Alignment","x-form-type":"materialselect","x-default":"center","properties":{"left":{"x-form-name":"Left","x-form-value":"left"},"center":{"x-form-name":"Center","x-form-value":"center"},"right":{"x-form-name":"Right","x-form-value":"right"}}} */
public String getButtonalign() {
return buttonalign;
}


//GEN]
Expand Down
Loading