Browse Source

Replaced symbolic links with forceLayout map

Closes #686
master
Igor Zhukov 10 years ago
parent
commit
d53566c034
  1. 9
      app/js/lib/utils.js
  2. 2
      app/partials/desktop/error_modal.html
  3. 1
      app/partials/mobile/confirm_modal.html
  4. 1
      app/partials/mobile/error_modal.html
  5. 1
      app/partials/mobile/media_modal_layout.html
  6. 1
      app/partials/mobile/slider.html

9
app/js/lib/utils.js

@ -275,7 +275,14 @@ function listUniqSorted (list) { @@ -275,7 +275,14 @@ function listUniqSorted (list) {
}
function templateUrl (tplName) {
return 'partials/' + (Config.Mobile ? 'mobile' : 'desktop') + '/' + tplName + '.html';
var forceLayout = {
confirm_modal: 'desktop',
error_modal: 'desktop',
media_modal_layout: 'desktop',
slider: 'desktop',
};
var layout = forceLayout[tplName] || (Config.Mobile ? 'mobile' : 'desktop');
return 'partials/' + layout + '/' + tplName + '.html';
}
function encodeEntities(value) {

2
app/partials/desktop/error_modal.html

@ -66,7 +66,7 @@ Stack: {{error.originalError.stack || error.stack}}</textarea> @@ -66,7 +66,7 @@ Stack: {{error.originalError.stack || error.stack}}</textarea>
</div>
<div class="md_simple_modal_footer">
<button class="btn btn-md" ng-click="$dismiss()">
<button class="btn btn-md btn-md-primary" ng-click="$dismiss()">
<span my-i18n="modal_ok"></span>
</button>
</div>

1
app/partials/mobile/confirm_modal.html

@ -1 +0,0 @@ @@ -1 +0,0 @@
../desktop/confirm_modal.html

1
app/partials/mobile/error_modal.html

@ -1 +0,0 @@ @@ -1 +0,0 @@
../desktop/error_modal.html

1
app/partials/mobile/media_modal_layout.html

@ -1 +0,0 @@ @@ -1 +0,0 @@
../desktop/media_modal_layout.html

1
app/partials/mobile/slider.html

@ -1 +0,0 @@ @@ -1 +0,0 @@
../desktop/slider.html
Loading…
Cancel
Save