Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Dark sidebar #13

Merged
merged 8 commits into from May 1, 2019
Merged

Dark sidebar #13

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
726d636
fixed conflict
emrysr Jan 9, 2019
93e7dd9
Merge branch 'master' of https://github.com/emoncms/find
emrysr Jan 9, 2019
7daf5e4
Merge branch 'master' of https://github.com/emoncms/find
emrysr Feb 15, 2019
b28a02a
modified menu structure to fit with new dark sidebar
emrysr Feb 15, 2019
acc27b1
re-ordered the menu file to allow sidebar and tabs to be accociated
emrysr Feb 27, 2019
d7bb7ea
fixed merge conflicts
emrysr Feb 27, 2019
200efe6
trying to fix git issue by adding changes to files
emrysr Apr 24, 2019
864e94e
bumped js/css version
emrysr Apr 30, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
5 changes: 2 additions & 3 deletions Views/find.php
View file
Open in desktop
@@ -1,9 +1,9 @@
<?php
global $path;
$version = 1;
$version = 2;
?>

<section id="intro" class="hero-unit text-center">
<section id="intro" class="hero-unit text-center mt-5">
<p><?php echo _("Find OpenEnergyMonitor devices on your local network"); ?></p>
<h2 id="ip" class="jumbotron-heading"><?php echo _("Getting your ip"); ?></h2>
<p id="loader" class="lead"><?php echo _("Searching..."); ?></p>
Expand Down Expand Up @@ -35,7 +35,6 @@
<script src="<?php echo $path; ?>Modules/find/js/find.js?v=<?php echo $version; ?>"></script>

<style>

#list li a{
padding: 1em 2em;
}
Expand Down
13 changes: 2 additions & 11 deletions Views/intro.php
View file
Open in desktop
@@ -1,9 +1,9 @@
<?php
global $path;
$version = 1;
$version = 2;
?>

<section id="intro" class="hero-unit text-center">
<section id="intro" class="hero-unit text-center mt-5">
<p class="lead"><?php echo _("Find OpenEnergyMonitor devices on your local network"); ?></p>
<h2 id="ip" class="jumbotron-heading">
<a href="<?php echo str_replace('https', 'http', $path) ?>find/ok" class="btn btn-success btn-large" target="_blank"><?php echo _("SCAN"); ?></a>
Expand All @@ -24,15 +24,6 @@
</script>

<style>
#intro{
top: 2.5rem;
left: 0;
border-radius: 0;
width: 100vw;
position: absolute;
height: 7rem;
padding: 3rem 0;
}
#more-details{
margin-top: 18rem;
}
Expand Down
18 changes: 5 additions & 13 deletions find_menu.php
View file
Open in desktop
@@ -1,15 +1,7 @@
<?php

$domain = "messages";
bindtextdomain($domain, "Modules/find/locale");
bind_textdomain_codeset($domain, 'UTF-8');

$menu_dropdown[] = array(
'id'=>"find_menu_extras",
'name'=>_("Find Local Devices"),
'path'=>"find" ,
'session'=>"read",
'order' => 0,
'icon'=>'icon-search'
);

$menu['setup'][] = array(
'text' => _("Find Local Devices"),
'path' => 'find',
'icon' => 'search'
);