combat 0.8.5 → 0.8.6
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- data/lib/settings.rb +6 -1
- data/lib/version.rb +1 -1
- data/templates/template.erb +7 -2
- metadata +1 -1
data/lib/settings.rb
CHANGED
|
@@ -16,7 +16,12 @@ class Settings
|
|
|
16
16
|
@ipa_file = "#{@filename}.ipa"
|
|
17
17
|
@plist_file_url = "#{@url}#{@plist_file}"
|
|
18
18
|
@template_file = options[:template] || "#{COMBAT_ROOT}/templates/template.erb"
|
|
19
|
-
|
|
19
|
+
|
|
20
|
+
if (type == 'android')
|
|
21
|
+
@qrcode = "http://qrcode.kaywa.com/img.php?s=8&d=#{ERB::Util.url_encode(@url)}#{@filename}.apk"
|
|
22
|
+
else
|
|
23
|
+
@qrcode = "http://qrcode.kaywa.com/img.php?s=8&d=#{ERB::Util.url_encode(@url)}"
|
|
24
|
+
end
|
|
20
25
|
end
|
|
21
26
|
|
|
22
27
|
def user_and_host
|
data/lib/version.rb
CHANGED
data/templates/template.erb
CHANGED
|
@@ -75,8 +75,13 @@
|
|
|
75
75
|
<% end %>
|
|
76
76
|
</ol>
|
|
77
77
|
<p class="desktop_only">
|
|
78
|
-
|
|
79
|
-
|
|
78
|
+
<% if @type == 'android' %>
|
|
79
|
+
Use QR code to install APK
|
|
80
|
+
<img src="<%= @qrcode %>" />
|
|
81
|
+
<% else %>
|
|
82
|
+
QR code to this page
|
|
83
|
+
<img src="<%= @qrcode %>" />
|
|
84
|
+
<% end %>
|
|
80
85
|
</p>
|
|
81
86
|
</div>
|
|
82
87
|
</body>
|