diff options
| author | Bernhard Posselt <nukeawhale@gmail.com> | 2012-10-13 00:13:31 +0200 |
|---|---|---|
| committer | Bernhard Posselt <nukeawhale@gmail.com> | 2012-10-13 00:13:31 +0200 |
| commit | 70aac9d0f9fdcc7919bd8a7ea4e814659dc4d36c (patch) | |
| tree | 6d0bc840a5151e0f193e10f79241d1d161193db4 | |
| parent | 86f8d785847ab7bf022a2734b736f8c3698ad714 (diff) | |
| parent | cb68f9f589bff6c43da5a2797e8e7b29f905b0ed (diff) | |
merged index
| -rw-r--r-- | index.php | 21 | ||||
| -rw-r--r-- | js/firstrun.js | 9 | ||||
| -rw-r--r-- | js/main.js | 5 | ||||
| -rw-r--r-- | templates/firstrun.php | 1 |
4 files changed, 16 insertions, 20 deletions
@@ -71,19 +71,12 @@ if(isset($_GET['jstest'])){ $tmpl->assign('feedtype', $feedtype); $tmpl->printPage(); - } else { - - OCP\Util::addScript('news','main'); - OCP\Util::addScript('news','news'); - OCP\Util::addScript('news','menu'); - OCP\Util::addScript('news','items'); - - OCP\Util::addStyle('news','firstrun'); - + } else { + + OCP\Util::addScript('news','news'); + OCP\Util::addScript('news','firstrun'); + OCP\Util::addStyle('news','firstrun'); $tmpl = new OCP\Template( 'news', 'firstrun', 'user' ); $tmpl->printPage(); - - } - - -}
\ No newline at end of file + } +} diff --git a/js/firstrun.js b/js/firstrun.js index e69de29bb..532b0e9cb 100644 --- a/js/firstrun.js +++ b/js/firstrun.js @@ -0,0 +1,9 @@ +var News = News || {}; + +$(document).ready(function(){ + + $('#browsebtn_firstrun, #cloudbtn_firstrun, #importbtn_firstrun').hide(); + +}); + + diff --git a/js/main.js b/js/main.js index e8942e096..6c88e9cfe 100644 --- a/js/main.js +++ b/js/main.js @@ -23,11 +23,6 @@ $(document).ready(function(){ News.Objects.Menu = new News.Menu(menuUpdateIntervalMiliseconds, News.Objects.Items); News.Objects.Menu.bindOn('#feeds > ul'); - /* first run script begins */ - $('#browsebtn_firstrun, #cloudbtn_firstrun, #importbtn_firstrun').hide(); - - /* first run script ends */ - $('#addfeed').click(function() { $('#addfeed_dialog').dialog('open'); $('#feed_add_url').html(''); diff --git a/templates/firstrun.php b/templates/firstrun.php index 0e3f443c0..0fc58a8aa 100644 --- a/templates/firstrun.php +++ b/templates/firstrun.php @@ -1,4 +1,3 @@ -<div id="appsettings" class="popup bottomleft hidden"></div> <div id="firstrun"> <h1><?php echo $l->t("You don't have any feed in your reader.") ?></h1> <div id="selections"> |