Merge branch 'master' into 'master'

interject login button

Submit button should be on the right.

See merge request !499

Author: Till Brehm

interface/web/login/templates/index.htm

@@ -21,8 +21,8 @@
 						<input type="hidden" name="s_mod" value="login" />
 						<input type="hidden" name="s_pg" value="index" />
 						<div class="right">
-			    		<input class="btn btn-default formbutton-default" type="submit" value="{tmpl_var name='login_txt'}">
 						<tmpl_if name="pw_lost_show"><button class="btn btn-default formbutton-default" type="button" value="{tmpl_var name='pw_lost_txt'}" onClick="document.location.href='password_reset.php';">{tmpl_var name='pw_lost_txt'}</button></tmpl_if>
+			    		<input class="btn btn-default formbutton-default" type="submit" value="{tmpl_var name='login_txt'}">
 						</div>
 			    	</fieldset>
 			      	</form>