Merge pull request #627 from Martii/Issue-169andOtherPostFixes

Move and duplicate Raw Source button to Source Code pages Auto-merge
OpenUserJS · Apr 30, 2015 · 9c3f06a · 9c3f06a
2 parents c4ab8b4 + 624873d
commit 9c3f06a
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 6 deletions.
diff --git a/controllers/user.js b/controllers/user.js
@@ -1281,6 +1281,8 @@ exports.editScript = function (aReq, aRes, aNext) {
  script.installNameSlug = installNameSlug;
  script.scriptPermalinkInstallPageUrl = 'https://' + aReq.get('host') +
  script.scriptInstallPageUrl;
+ script.scriptRawPageUrl = '/src/' + (isLib ? 'libs' : 'scripts') + '/'
+ + installNameSlug + (isLib ? '.js' : '.user.js#');
 
  // Page metadata
  pageMetadata(options);

diff --git a/views/includes/scriptPageHeader.html b/views/includes/scriptPageHeader.html
@@ -1,14 +1,16 @@
 <h2 class="page-heading">
  {{#isScriptPage}}
- <a href="{{{script.scriptInstallPageUrl}}}" class="btn btn-info pull-right">
- {{#script.isLib}}
- <i class="fa fa-file-text-o"></i> Raw Source
- {{/script.isLib}}
  {{^script.isLib}}
- <i class="fa fa-download"></i> Install
+ <a href="{{{script.scriptInstallPageUrl}}}" class="btn btn-info pull-right">
+ <i class="fa fa-download"></i> Install
+ </a>
  {{/script.isLib}}
- </a>
  {{/isScriptPage}}
+ {{#isScriptViewSourcePage}}
+ <a href="{{{script.scriptRawPageUrl}}}" class="btn btn-info pull-right">
+ <i class="fa fa-file-text-o"></i> Raw Source
+ </a>
+ {{/isScriptViewSourcePage}}
  {{#script.icon45Url}}
  <span class="page-heading-icon" {{#script.icon45Url}}data-icon-src="{{{script.icon45Url}}}"{{/script.icon45Url}}>
  {{#script.isLib}}<i class="fa fa-fw fa-file-excel-o"></i>{{/script.isLib}}{{^script.isLib}}<i class="fa fa-fw fa-file-code-o"></i>{{/script.isLib}}