wbrawner/server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'master' of gitorious.org:owncloud/owncloud

Browse source
This commit is contained in:
Georg Ehrke 2011-09-28 18:44:17 +02:00
commit 61c4f9b3c8
9 changed files with 36 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
apps/calendar/templates/settings.php
View file

@ -25,5 +25,8 @@
endif;
endforeach;?>
</select><span class="msg"></span>
<br />
Calendar CalDAV Syncing URL:
<?php echo OC_Helper::linkTo('apps/calendar', 'caldav.php', null, true); ?><br />
</fieldset>
</form>

3
apps/contacts/appinfo/app.php
View file

@ -17,3 +17,6 @@ OC_App::addNavigationEntry( array(
'href' => OC_Helper::linkTo( 'contacts', 'index.php' ),
'icon' => OC_Helper::imagePath( 'settings', 'users.svg' ),
'name' => 'Contacts' ));
OC_APP::registerPersonal('contacts','settings');

6
apps/contacts/settings.php Normal file
View file

@ -0,0 +1,6 @@
<?php
$tmpl = new OC_Template( 'contacts', 'settings');
return $tmpl->fetchPage();
?>

7
apps/contacts/templates/settings.php Normal file
View file

@ -0,0 +1,7 @@
<form id="mediaform">
<fieldset class="personalblock">
<strong>Contacts</strong><br />
CardDAV Syncing URL:
<?php echo OC_Helper::linkTo('apps/contacts', 'carddav.php', null, true); ?><br />
</fieldset>
</form>

1
apps/media/appinfo/app.php
View file

@ -25,6 +25,7 @@ $l=new OC_L10N('media');
require_once('apps/media/lib_media.php');
OC_Util::addScript('media','loader');
OC_APP::registerPersonal('media','settings');
OC_App::register( array( 'order' => 3, 'id' => 'media', 'name' => 'Media' ));

6
apps/media/settings.php Normal file
View file

@ -0,0 +1,6 @@
<?php
$tmpl = new OC_Template( 'media', 'settings');
return $tmpl->fetchPage();
?>

7
apps/media/templates/settings.php Normal file
View file

@ -0,0 +1,7 @@
<form id="mediaform">
<fieldset class="personalblock">
<strong>Media</strong><br />
Ampache URL:
<?php echo OC_Helper::linkTo('apps/media', 'tomahawk.php', null, true); ?><br />
</fieldset>
</form>

4
core/css/styles.css
View file

@ -61,8 +61,8 @@ input[type="submit"].highlight{ background:#ffc100; border:1px solid #db0; text-
/* LOG IN & INSTALLATION ------------------------------------------------------------ */
#body-login { background:#ddd; }
#body-login p.info { width:16em; margin:2em auto; padding:1em; background:#eee; -moz-box-shadow:0 1px 0 #bbb inset; -webkit-box-shadow:0 1px 0 #bbb inset; box-shadow:0 1px 0 #bbb inset; -moz-border-radius:1em; -webkit-border-radius:1em; border-radius:1em; }
#body-login p.info a { font-weight:bold; }
#body-login p.info { width:21em; margin:2em auto; color:#777; text-shadow:#fff 0 1px 0; }
#body-login p.info a { font-weight:bold; color:#777; }
#login { min-height:30em; margin:2em auto 0; border-bottom:1px solid #f8f8f8; background:#eee; }
#login form { width:18em; margin:2em auto 5em; padding:0; }

2
core/templates/layout.guest.php
View file

@ -32,6 +32,6 @@
</div></header>
<?php echo $_['content']; ?>
</div>
<footer><p class="info"><a href="http://owncloud.org/">ownCloud</a> <?php echo $l->t( 'gives you freedom and control over your own data' ); ?></p></footer>
<footer><p class="info"><a href="http://owncloud.org/">ownCloud</a>: <?php echo $l->t( 'web services under your control' ); ?></p></footer>
</body>
</html>