Skip to content

Commit 0318ec5

Browse files
authored
Some misc near parallel UI changes (#1208)
* Change some icons around * Add a tooltip * Move default licensing arbitration to view instead of code... allows visual detection Post #1204 #191 Loosely related to #116, and #944 via #970 Auto-merge
1 parent f2c5d4d commit 0318ec5

File tree

6 files changed

+6
-7
lines changed

6 files changed

+6
-7
lines changed

controllers/script.js

-2
Original file line numberDiff line numberDiff line change
@@ -148,8 +148,6 @@ var getScriptPageTasks = function (aOptions) {
148148
license.forEach(function (aElement, aIndex, aArray) {
149149
aOptions.script.licenses.unshift({ name: aElement.value });
150150
});
151-
} else if (!script.isLib) {
152-
aOptions.script.licenses = [{ name: 'MIT License (Expat)' }];
153151
}
154152

155153
// Show collaborators of the script

views/includes/commentEditor.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
</div>
2626
<section class="post-menu-area">
2727
<div class="submit-panel btn-toolbar">
28-
<a href="/about/Frequently-Asked-Questions"><i class="fa fa-book"></i></a>
28+
<a href="/about/Frequently-Asked-Questions"><i class="fa fa-question-circle" title="FAQ"></i></a>
2929
<a href="https://guides.github.com/features/mastering-markdown/" title="GitHub Flavor Markdown compatible"><i class="octicon octicon-markdown"></i></a>
3030
<button class="btn btn-sm btn-success pull-right" title="submit your comment" type="submit">
3131
<i class="fa fa-fw fa-reply"></i> Submit

views/includes/commentForm.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
<div class="container-fluid row user-content">
2525
<textarea name="comment-content" data-provide="markdown" data-iconlibrary="fa" class="col-xs-12" placeholder="Type here using Markdown." required="required"></textarea>
2626
<div class="submit-panel btn-toolbar">
27-
<a href="/about/Frequently-Asked-Questions"><i class="fa fa-book"></i></a>
27+
<a href="/about/Frequently-Asked-Questions"><i class="fa fa-question-circle" title="FAQ"></i></a>
2828
<a href="https://guides.github.com/features/mastering-markdown/"><i class="octicon octicon-markdown" title="GitHub Flavor Markdown compatible"></i></a>
2929
<button class="btn-sm btn btn-success pull-right" type="submit"><i class="fa fa-reply"></i> Reply</button>
3030
</div>

views/includes/scriptAuthorToolsPanel.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
<a class="btn btn-{{#lockdown.updateURLCheck}}info{{/lockdown.updateURLCheck}}{{^lockdown.updateURLCheck}}default{{/lockdown.updateURLCheck}}"
2020
title="How do I use this?"
2121
href="/about/Frequently-Asked-Questions#q-does-openuserjs-org-have-meta-">
22-
<i class="fa fa-{{#lockdown.updateURLCheck}}exclamation{{/lockdown.updateURLCheck}}{{^lockdown.updateURLCheck}}question{{/lockdown.updateURLCheck}}"></i>
22+
<i class="fa fa-{{#lockdown.updateURLCheck}}exclamation-triangle{{/lockdown.updateURLCheck}}{{^lockdown.updateURLCheck}}question-circle{{/lockdown.updateURLCheck}}"></i>
2323
</a>
2424
</span>
2525
</div>

views/includes/scriptPageHeader.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ <h2 class="page-heading">
1919
{{/script.showMinficationNotices}}
2020
</li>
2121
<li role="separator" class="divider"></li>
22-
<li><a href="/about/Userscript-Beginners-HOWTO"><em class="fa fa-fw fa-file-text-o"></em> Userscript Beginners HOWTO</a></li>
22+
<li><a href="/about/Userscript-Beginners-HOWTO"><em class="fa fa-fw fa-question-circle"></em> Userscript Beginners HOWTO</a></li>
2323
</ul>
2424
</div>
2525
{{/script.isLib}}

views/pages/scriptPage.html

+2-1
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,8 @@
4949
{{#script.homepages}}<p><i class="fa fa-fw fa-home"></i> <b>Homepage:</b> <a href="{{{url}}}"{{#hasNoFollow}} rel="nofollow"{{/hasNoFollow}}>{{text}}</a></p>{{/script.homepages}}
5050
{{#script.support}}<p><i class="fa fa-fw fa-support"></i> <b>Support:</b> <a href="{{{url}}}"{{#hasNoFollow}} rel="nofollow"{{/hasNoFollow}}>{{text}}</a></p>{{/script.support}}
5151
{{#script.copyrights}}<p><i class="fa fa-fw fa-copyright"></i> <b>Copyright:</b> {{name}}</p>{{/script.copyrights}}
52-
{{#script.licenses}}<p><i class="fa fa-fw fa-legal"></i> <b>License:</b> {{name}}</p>{{/script.licenses}}
52+
{{#script.licenses}}<p><i class="fa fa-fw fa-balance-scale"></i> <b>License:</b> {{name}}</p>{{/script.licenses}}
53+
{{^script.isLib}}{{^script.licenses}}<p><i class="fa fa-fw fa-legal"></i> <b>License:</b> MIT License (Expat)</p>{{/script.licenses}}{{/script.isLib}}
5354
{{#hasCollab}}
5455
<p><i class="fa fa-fw fa-user"></i> <b>Collaborator:</b> {{#script.collaborators}} <span class="label label-info"><a href="/users/{{{url}}}">{{text}}</a></span> {{/script.collaborators}}</p>
5556
{{/hasCollab}}

0 commit comments

Comments
 (0)