Merge pull request #1256 from calmh/fix-963

Adds File Versioning to folder info (fixes #963)
This commit is contained in:
Audrius Butkevicius committed 2015-01-15 17:25:28 +00:00
commit 261825a89b
2 files changed
+8 -1

No files matched your search

+7
View File
@@ -150,6 +150,13 @@
<th><span class="glyphicon glyphicon-refresh"></span>&emsp;<span translate>Rescan Interval</span></th>
<td class="text-right">{{folder.RescanIntervalS}} s</td>
</tr>
<tr ng-if="folder.Versioning.Type">
<th><span class="glyphicon glyphicon-tags"></span>&emsp;<span translate>File Versioning</span></th>
<td class="text-right" ng-switch="folder.Versioning.Type">
<span ng-switch-when="staggered" translate>Staggered File Versioning</span>
<span ng-switch-when="simple" translate>Simple File Versioning</span>
</td>
</tr>
<tr>
<th><span class="glyphicon glyphicon-share-alt"></span>&emsp;<span translate>Shared With</span></th>
<td class="text-right">{{sharesFolder(folder)}}</td>
+1 -1
View File
@@ -152,7 +152,7 @@ func Assets() map[string][]byte {
bs, _ = ioutil.ReadAll(gr)
assets["assets/lang/valid-langs.js"] = bs
bs, _ = base64.StdEncoding.DecodeString("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 truncated
bs, _ = base64.StdEncoding.DecodeString("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 truncated
gr, _ = gzip.NewReader(bytes.NewReader(bs))
bs, _ = ioutil.ReadAll(gr)
assets["index.html"] = bs