Skip to content
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

Jump to bottom

SAK-42643 - Switching from fonticonpicker to fontawesome-iconpicker f… #8027

Merged
merged 4 commits into from
Mar 28, 2020
Merged

SAK-42643 - Switching from fonticonpicker to fontawesome-iconpicker f… #8027

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
424105c
SAK-42643 - Switching from fonticonpicker to fontawesome-iconpicker f…
jonespm Mar 15, 2020
76bcf5c
More code to create a better looking input field dynamically rather t…
jonespm Mar 16, 2020
8356961
Some code formatting and fixing up layout in LTI
jonespm Mar 23, 2020
30cf2b9
Update pom.xml
Mar 28, 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
Prev Previous commit
Next Next commit
Some code formatting and fixing up layout in LTI
  • Loading branch information
@jonespm
jonespm committed Mar 23, 2020
commit 835696127e5ecafe1175296a758f0dbf3dd2f4dd
14 changes: 8 additions & 6 deletions basiclti/basiclti-common/src/java/org/sakaiproject/util/foorm/Foorm.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -302,7 +302,7 @@ public String formInput(Object row, String fieldinfo) {
public void formInputStart(StringBuffer sb, String field, String type, String label,
boolean required, Object loader) {
// Checkbox and radio no longer call this
sb.append("<p id=\"");
sb.append("<div id=\"");
sb.append(field);
sb.append("-input\" class=\"foorm-"+type+"\" style=\"clear:both;\">");

Expand Down Expand Up @@ -331,7 +331,7 @@ public void formInputStart(StringBuffer sb, String field, String type, String la
*/
public void formInputEnd(StringBuffer sb, String field, String type, String label, boolean required,
Object loader) {
sb.append("</p>\n");
sb.append("</div>\n");
}

/**
Expand All @@ -350,15 +350,17 @@ public String formInputText(String value, String field, String label, boolean re
value = "";
StringBuffer sb = new StringBuffer();
formInputStart(sb, field, "text", label, required, loader);
sb.append("<input type=\"text\" id=\"");
sb.append("<div id=\"div_");
sb.append(field);
sb.append("\"><input type=\"text\" id=\"");
sb.append(field);
sb.append("\" name=\"");
sb.append(field);
sb.append("\" size=\"");
sb.append(size);
sb.append("\" style=\"border:1px solid #555;padding:5px;font-size:1em;width:300px\" value=\"");
sb.append(htmlSpecialChars(value));
sb.append("\"/>");
sb.append("\"/></div>");
jonespm marked this conversation as resolved.
Show resolved Hide resolved
formInputEnd(sb, field, "text", label, required, loader);
return sb.toString();
}
Expand Down Expand Up @@ -820,7 +822,7 @@ public String formOutput(Object row, String fieldinfo) {
* @param loader
*/
public void formOutputStart(StringBuffer sb, String field, String label, Object loader) {
sb.append("<p class=\"foorm-text\" id=\""+field+"\">\n");
sb.append("<div class=\"foorm-text\" id=\""+field+"\">\n");
if (label != null) {
sb.append("<b>");
sb.append(getI18N(label, loader));
Expand All @@ -836,7 +838,7 @@ public void formOutputStart(StringBuffer sb, String field, String label, Object
* @param loader
*/
public void formOutputEnd(StringBuffer sb, String field, String label, Object loader) {
sb.append("</p>\n");
sb.append("</div>\n");
}

/**
Expand Down
2 changes: 1 addition & 1 deletion basiclti/basiclti-portlet/src/webapp/edit.jsp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ Boolean allowRoster = (Boolean) rReq.getAttribute("allowRoster");
<script type="text/javascript" src="/library/js/headscripts.js"></script>
<script>
includeLatestJQuery('portlet edit.jsp');
includeWebjarLibrary('fontawesome-iconpicker');
includeWebjarLibrary('fontawesome-iconpicker');
</script>

<ul class="navIntraTool actionToolBar">
Expand Down
2 changes: 1 addition & 1 deletion basiclti/basiclti-tool/src/webapp/vm/lti_content_config.vm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ setTimeout('window.location="$autoLaunch";', 1500);
<script type="text/javascript" src="/library/js/headscripts.js"></script>
<script>
includeLatestJQuery('lti_content_config.vm');
includeWebjarLibrary('fontawesome-iconpicker');
includeWebjarLibrary('fontawesome-iconpicker');
</script>
<h3>
$tlang.getString("content.put")
Expand Down
2 changes: 1 addition & 1 deletion basiclti/basiclti-tool/src/webapp/vm/lti_content_insert.vm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<script type="text/javascript" src="/library/js/headscripts.js"></script>
<script>
includeLatestJQuery('lti_content_insert.vm');
includeWebjarLibrary("fontawesome-iconpicker");
includeWebjarLibrary("fontawesome-iconpicker");
</script>
<h3>
#if ( $oldContentId )
Expand Down
3 changes: 1 addition & 2 deletions basiclti/basiclti-tool/src/webapp/vm/lti_tool_insert.vm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,8 @@
<script type="text/javascript" src="/library/js/headscripts.js"></script>
<script>
includeLatestJQuery('lti_tool_insert.vm');
includeWebjarLibrary('fontawesome-iconpicker');
includeWebjarLibrary('fontawesome-iconpicker');
</script>

<h3>
$tlang.getString("tool.put")
</h3>
Expand Down
2 changes: 1 addition & 1 deletion basiclti/web-ifp/src/bundle/vm/edit.vm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<script type="text/javascript" src="/library/js/headscripts.js"></script>
<script>
includeLatestJQuery('web-ifp edit.vm');
includeWebjarLibrary('fontawesome-iconpicker');
includeWebjarLibrary('fontawesome-iconpicker');
</script>
<h3>
$tlang.getString("gen.custom")
Expand Down