Commit 188bd2cd authored by Julia Radzhabova's avatar Julia Radzhabova

Merge remote-tracking branch 'origin/develop' into develop

parents 88a33663 538b7ff0
...@@ -40,12 +40,13 @@ ...@@ -40,12 +40,13 @@
</div> </div>
<div class="page" id="addimage-url"> <div class="page" id="addimage-url">
<div class="page-content"> <div class="page-content">
<div class="content-block-title"><%= scope.textAddress %></div> <% if (!android) { %><div class="content-block-title"><%= scope.textAddress %></div><% } %>
<div class="list-block"> <div class="list-block">
<ul> <ul>
<li> <li>
<div id="addimage-link-url" class="item-content"> <div id="addimage-link-url" class="item-content">
<div class="item-inner"> <div class="item-inner">
<% if (android) { %><div class="item-title label"><%= scope.textAddress %></div><% } %>
<div class="item-input"> <div class="item-input">
<input type="url" placeholder="<%= scope.textImageURL %>"> <input type="url" placeholder="<%= scope.textImageURL %>">
</div> </div>
......
...@@ -40,12 +40,13 @@ ...@@ -40,12 +40,13 @@
</div> </div>
<div class="page" id="addimage-url"> <div class="page" id="addimage-url">
<div class="page-content"> <div class="page-content">
<div class="content-block-title"><%= scope.textAddress %></div> <% if (!android) { %><div class="content-block-title"><%= scope.textAddress %></div><% } %>
<div class="list-block"> <div class="list-block">
<ul> <ul>
<li> <li>
<div id="addimage-link-url" class="item-content"> <div id="addimage-link-url" class="item-content">
<div class="item-inner"> <div class="item-inner">
<% if (android) { %><div class="item-title label"><%= scope.textAddress %></div><% } %>
<div class="item-input"> <div class="item-input">
<input type="url" placeholder="<%= scope.textImageURL %>"> <input type="url" placeholder="<%= scope.textImageURL %>">
</div> </div>
......
...@@ -82,12 +82,13 @@ ...@@ -82,12 +82,13 @@
<div id="addother-imagefromurl"> <div id="addother-imagefromurl">
<div class="page" id="addimage-fromurl" data-page="addimage-url"> <div class="page" id="addimage-fromurl" data-page="addimage-url">
<div class="page-content"> <div class="page-content">
<div class="content-block-title"><%= scope.textAddress %></div> <% if (!android) { %><div class="content-block-title"><%= scope.textAddress %></div><% } %>
<div class="list-block"> <div class="list-block">
<ul> <ul>
<li> <li>
<div id="addimage-link-url" class="item-content"> <div id="addimage-link-url" class="item-content">
<div class="item-inner"> <div class="item-inner">
<% if (android) { %><div class="item-title label"><%= scope.textAddress %></div><% } %>
<div class="item-input"> <div class="item-input">
<input type="url" placeholder="<%= scope.textImageURL %>"> <input type="url" placeholder="<%= scope.textImageURL %>">
</div> </div>
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment