diff --git a/3.0/modules/fittoscreen/controllers/admin_fittoscreen.php b/3.0/modules/fittoscreen/controllers/admin_fittoscreen.php
new file mode 100644
index 00000000..3a8eb456
--- /dev/null
+++ b/3.0/modules/fittoscreen/controllers/admin_fittoscreen.php
@@ -0,0 +1,46 @@
+<?php defined("SYSPATH") or die("No direct script access.");
+
+class Admin_fittoscreen_Controller extends Admin_Controller {
+  public function index() {
+    print $this->_get_view();
+  }
+
+  private function _get_view($form=null) {
+    $view = new Admin_View("admin.html");
+    $view->page_title = t("Fit to Screen parameters");
+
+    $view->content = new View("admin_fittoscreen.html");
+    $view->content->form = (empty($form) ? $this->_get_form() : $form) ;
+
+    return $view;
+  }
+
+  private function _get_form() {
+    $form = new Forge("admin/fittoscreen/save", "", "post", array("id" => "g-admin-form"));
+
+    $form->dropdown("width_unit")->label(t("Image width unit"))->options(array("px"=>"pixel margin","pr"=>"max pourcentage"))->selected(module::get_var("fittoscreen", "width_unit"));
+    $form->input("width")->label(t('width'))->rules("required|valid_numeric|length[1,5]")->value(module::get_var("fittoscreen", "width"));
+    $form->dropdown("height_unit")->label(t("Image height unit"))->options(array("px"=>"pixel margin","pr"=>"max pourcentage"))->selected(module::get_var("fittoscreen", "height_unit"));
+    $form->input("height")->label(t('height'))->rules("required|valid_numeric|length[1,5]")->value(module::get_var("fittoscreen", "height"));
+
+    $form->submit("submit")->value(t("Save"));
+    return $form;
+  }
+
+  public function save(){
+    access::verify_csrf();
+
+    $form = $this->_get_form();
+    if ($form->validate()) {
+      module::set_var("fittoscreen", "width_unit",  $form->width_unit->value);      
+      module::set_var("fittoscreen", "width",  $form->width->value);      
+      module::set_var("fittoscreen", "height_unit",  $form->height_unit->value);      
+      module::set_var("fittoscreen", "height",  $form->height->value);      
+
+    }
+    
+    print $this->_get_view($form);
+  }
+}
+
+?>
diff --git a/3.0/modules/fittoscreen/helpers/fittoscreen_event.php b/3.0/modules/fittoscreen/helpers/fittoscreen_event.php
new file mode 100644
index 00000000..5dbe65f7
--- /dev/null
+++ b/3.0/modules/fittoscreen/helpers/fittoscreen_event.php
@@ -0,0 +1,13 @@
+<?php defined("SYSPATH") or die("No direct script access.");
+
+class fittoscreen_event_Core {
+  static function admin_menu($menu, $theme) {
+    $menu->get("settings_menu")
+      ->append(Menu::factory("link")
+               ->id("fittoscreen_menu")
+               ->label(t("Fit to Screen"))
+               ->url(url::site("admin/fittoscreen")));
+  }
+}
+
+?>
diff --git a/3.0/modules/fittoscreen/helpers/fittoscreen_installer.php b/3.0/modules/fittoscreen/helpers/fittoscreen_installer.php
new file mode 100644
index 00000000..0e4b7ec0
--- /dev/null
+++ b/3.0/modules/fittoscreen/helpers/fittoscreen_installer.php
@@ -0,0 +1,14 @@
+<?php defined("SYSPATH") or die("No direct script access.");
+
+class fittoscreen_installer {
+  static function install() {
+    module::set_var("fittoscreen", "width",  "150");    
+    module::set_var("fittoscreen", "height",  "200");    
+    module::set_version("fittoscreen", 10);
+  }
+
+
+}
+
+?>
+
diff --git a/3.0/modules/fittoscreen/helpers/fittoscreen_theme.php b/3.0/modules/fittoscreen/helpers/fittoscreen_theme.php
new file mode 100644
index 00000000..de804e95
--- /dev/null
+++ b/3.0/modules/fittoscreen/helpers/fittoscreen_theme.php
@@ -0,0 +1,9 @@
+<?php defined("SYSPATH") or die("No direct script access.");
+
+class fittoscreen_theme {
+  static function photo_top($theme) {
+        return new View("fittoscreen_photo.html");
+  }
+}
+
+?>
diff --git a/3.0/modules/fittoscreen/module.info b/3.0/modules/fittoscreen/module.info
new file mode 100644
index 00000000..39067339
--- /dev/null
+++ b/3.0/modules/fittoscreen/module.info
@@ -0,0 +1,7 @@
+name = "Fit to Screen"
+description = "Dynamicaly resize the photo size to fit the screen.<br />Version 1.0 | By <a href=http://www.bouthors.fr>Matthieu Bouthors</a> | <a href=http://codex.gallery2.org/Gallery3:Modules:fittoscreen>Visit plugin Site</a> | <a href=http://gallery.menalto.com/node/103929>Support</a> | <a href=fittoscreen>Settings</a>"
+version = 10
+author_name = "Matthieu Bouthors"
+author_url = "http://www.bouthors.fr"
+info_url = "http://codex.gallery2.org/Gallery3:Modules:Fittoscreen"
+discuss_url = "http://gallery.menalto.com/node/103929"
diff --git a/3.0/modules/fittoscreen/views/admin_fittoscreen.html.php b/3.0/modules/fittoscreen/views/admin_fittoscreen.html.php
new file mode 100644
index 00000000..dffd8e8d
--- /dev/null
+++ b/3.0/modules/fittoscreen/views/admin_fittoscreen.html.php
@@ -0,0 +1,7 @@
+<?php defined("SYSPATH") or die("No direct script access.") ?>
+<div class="g-block">
+  <h1> <?= t("Fit to Screen parameters") ?> </h1>
+  <div class="g-block-content">
+    <?= $form ?>
+  </div>
+</div>
diff --git a/3.0/modules/fittoscreen/views/fittoscreen_photo.html.php b/3.0/modules/fittoscreen/views/fittoscreen_photo.html.php
new file mode 100644
index 00000000..762a588d
--- /dev/null
+++ b/3.0/modules/fittoscreen/views/fittoscreen_photo.html.php
@@ -0,0 +1,35 @@
+<?php defined("SYSPATH") or die("No direct script access.") ?>
+
+<script type="text/javascript">
+
+function dynresize() {
+ var $maxheight = <?= $item->resize_height ?>;
+ var $maxwidth = <?= $item->resize_width ?>;
+
+ var $ratio = $maxwidth/$maxheight;
+
+ var $winwidth = $(window).width() <?= (module::get_var("fittoscreen", "width_unit")=="pr" ? "*".number_format(module::get_var("fittoscreen", "width")/100,2,".","") : "-".module::get_var("fittoscreen", "width")) ?>;
+ var $winheight = $(window).height() <?= (module::get_var("fittoscreen", "height_unit")=="pr" ? "*".number_format(module::get_var("fittoscreen", "height")/100,2,".","") : "-".module::get_var("fittoscreen", "height")) ?>;
+
+ if (($winwidth/$winheight)<$ratio) {
+    $finalwidth = ($winwidth > $maxwidth ? $maxwidth : $winwidth);
+    $finalheight = $finalwidth / $ratio;
+ }
+else {
+    $finalheight = ($winheight > $maxheight ? $maxheight : $winheight);
+    $finalwidth = $finalheight * $ratio;
+ }
+
+
+// $('body').prepend('<div>' + $finalheight + " " + $finalwidth + '</div>');
+
+ $("img.g-resize").attr({
+                                height: $finalheight,
+                                width: $finalwidth,
+                        });
+
+}
+
+$(window).resize(dynresize);
+$(document).ready(dynresize);
+</script>