aboutsummaryrefslogtreecommitdiffstats
path: root/view/tpl
diff options
context:
space:
mode:
Diffstat (limited to 'view/tpl')
-rwxr-xr-xview/tpl/nav.tpl11
-rw-r--r--view/tpl/nav_login.tpl15
-rwxr-xr-xview/tpl/rmagic.tpl18
3 files changed, 25 insertions, 19 deletions
diff --git a/view/tpl/nav.tpl b/view/tpl/nav.tpl
index 68326a077..8f8165ba1 100755
--- a/view/tpl/nav.tpl
+++ b/view/tpl/nav.tpl
@@ -145,14 +145,8 @@
</li>
{{/if}}
{{if $nav.login && !$userinfo}}
- <li class="hidden-xs">
- <a href="#" title="{{$nav.loginmenu.0.3}}" id="{{$nav.loginmenu.0.4}}" onclick="openClose('nav-login'); return false;">{{$nav.loginmenu.0.1}} <span class="caret" id="loginmenu-caret"></span></a>
- <div id="nav-login" class="dropdown-menu">
- <div class="form-group">
- {{$nav.login}}
- </div>
- {{$nav.remote_login}}
- </div>
+ <li class="">
+ <a href="#" title="{{$nav.loginmenu.1.3}}" id="{{$nav.loginmenu.1.4}}" data-toggle="modal" data-target="#nav-login">{{$nav.loginmenu.1.1}}</a>
</li>
{{/if}}
{{if $nav.register}}
@@ -186,6 +180,7 @@
{{$navapps}}
</ul>
</div>
+
{{if $nav.help.6}}
<div id="contextual-help-content" class="contextual-help-content">
{{$nav.help.5}}
diff --git a/view/tpl/nav_login.tpl b/view/tpl/nav_login.tpl
new file mode 100644
index 000000000..5ad5a4990
--- /dev/null
+++ b/view/tpl/nav_login.tpl
@@ -0,0 +1,15 @@
+{{if $nav.login && !$userinfo}}
+<div id="nav-login" class="modal" role="dialog">
+ <div class="modal-dialog">
+ <div class="modal-content">
+ <div class="modal-header"><h3>{{$nav.loginmenu.1.1}}</h3></div>
+ <div class="modal-body">
+ <div class="form-group">
+ {{$nav.login}}
+ {{$nav.remote_login}}
+ </div>
+ </div>
+ </div>
+ </div>
+</div>
+{{/if}}
diff --git a/view/tpl/rmagic.tpl b/view/tpl/rmagic.tpl
index d0f7aab64..9d84e4a36 100755
--- a/view/tpl/rmagic.tpl
+++ b/view/tpl/rmagic.tpl
@@ -1,13 +1,9 @@
<div class="generic-content-wrapper-styled">
-<h3>{{$title}}</h3>
-
-<form action="rmagic" method="post" >
-
- <label for="rmagic-address" id="label-rmagic-address" class="rmagic-label">{{$desc}}</label>
- <input type="text" maxlength="255" size="32" name="address" id="rmagic-address" class="rmagic-input" value="" />
-
- <input type="submit" name="submit" id="rmagic-submit-button" value="{{$submit}}" />
- <div id="rmagic-submit-end" class="rmagic-field-end"></div>
-
-</form>
+ <h3>{{$title}}</h3>
+ <form action="rmagic" method="post" >
+ <div class="form-group">
+ {{include file="field_input.tpl" field=$address}}
+ <input class="btn btn-primary" type="submit" name="submit" id="rmagic-submit-button" value="{{$submit}}" />
+ </div>
+ </form>
</div>