Changeset 57

Timestamp:

06/02/08 13:56:30 (2 years ago)

Author:

nperriault

Message:

Application add form, styles - still work in progress

Files:

• trunk/apps/main/modules/applications/actions/actions.class.php (modified) (5 diffs)
• trunk/apps/main/modules/applications/templates/_form.php (modified) (2 diffs)
• trunk/apps/main/modules/applications/templates/editSuccess.php (modified) (1 diff)
• trunk/lib/form/application/ApplicationForm.class.php (modified) (1 diff)
• trunk/lib/model/Application.php (modified) (2 diffs)
• trunk/lib/symfonians/ImagesTools.class.php (modified) (4 diffs)
• trunk/web/css/style.css (modified) (1 diff)

trunk/apps/main/modules/applications/actions/actions.class.php

@@ -11 +11 @@
-  public function executeAdd(sfWebRequest $request)
-  {
-
-
-
-
-
-
-
-
-
-
+
-  }
-
@@ -30 +21 @@
-  public function executeEdit(sfWebRequest $request)
-  {
-
-
-
+
+
+
+
+
+
+
+
+
+
-    {
-      $this->getUser()->setFlash('warning', $this->__('You are not allowed to edit this record'));
-
-
-
+
+
+
+
+
+
+
-    if ($request->isMethod('post'))
-    {
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-    }
-  }
@@ -182 +210 @@
-    // User is submitter?
-    $this->user_is_submitter = $this->application->getSubmitterId() === $this->getUser()->getId();
-  }
-
-  protected function getFromSlug($peer_method = null)
-  {
-    $slug = $this->getRequestParameter('slug');
-    $c = new Criteria;
-    $c->addJoin(ApplicationPeer::SUBMITTER_ID, sfGuardUserPeer::ID, Criteria::LEFT_JOIN);
-    $c->add(ApplicationPeer::SLUG, $slug);
-    $application = ApplicationPeer::doSelectOne($c);
-    $this->forward404Unless($application, sprintf('Unable to retrieve application "%s"',$slug));
-    return $application;
-  }
-
@@ -269 +286 @@
-    $this->tags = TagPeer::getPopulars($c);
-  }
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-  }
-
@@ -304 +339 @@
-    $this->setTemplate('connectAsDeveloper');
-    return sfView::SUCCESS;
+  }
+  
+  /**
+   * Process uploaded image file and updates passed Application object with the
+   * thumb path field updated
+   *
+   * @param  sfValidatedFile|null  $file         The uploaded file
+   * @param  Application           $application  The Application object instance
+   */
+  protected function processUploadedImage($file, Application &$application)
+  {
+    if (is_null($file))
+    {
+      return null;
+    }
+    
+    $thumb = ImagesTools::createThumb (
+      $file,
+      sfConfig::get('sf_upload_dir').DIRECTORY_SEPARATOR.sfConfig::get('app_applications_upload_dir', 'applications'),
+      md5($application_data->getName()).'.jpg',
+      sfConfig::get('app_applications_screenshot_width', 200),
+      sfConfig::get('app_applications_screenshot_height', 140),
+      sfConfig::get('app_applications_screenshot_mime', 'image/jpeg'),
+      sfConfig::get('app_applications_screenshot_quality', 90)
+    );
+    
+    $application->setScreenshotPath($thumb);
-  }
-

trunk/apps/main/modules/applications/templates/_form.php

@@ -14 +14 @@
-    <fieldset>
-      <legend><?php echo __('Application informations') ?></legend>
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
-    </fieldset>
-  </div>
@@ -42 +23 @@
-    <fieldset>
-      <legend><?php echo __('Other informations') ?></legend>
-
+
+
-      <div class="form-row">
-
-
-
+
+
-      </div>
-
-
-
-
+
+
+
+
+
-      </div>
-      <div class="form-row">
-        <?php echo object_checkbox_tag($application, 'getIsOpensource', 'name=application[is_opensource]', $sf_params->get('application[is_opensource]')) ?>
-        <label for="is_opensource" class="inline">
-          <?php echo __('Application is open source') ?>
-        </label>
-        <?php echo form_error('application[is_opensource]') ?>
-      </div>
-      <div class="form-row">
-        <label for="licence"><?php echo __('Licence (if open source)') ?></label>
-        <?php echo object_input_tag($application, 'getLicence', 'name=application[licence]', $sf_params->get('application[licence]')) ?>
-        <?php echo form_error('application[licence]') ?>
-      </div>
-      <div class="form-row">
-        <label for="feed_url"><?php echo __('Application development feed url') ?></label>
-        <?php echo object_input_tag($application, 'getFeedUrl', 'name=application[feed_url]', $sf_params->getRawValue()->get('application[feed_url]', 'http://')) ?>
-        <?php echo form_error('application[feed_url]') ?>
-      </div>
-      <div class="form-row">
-        <label for="started_at"><?php echo __('Development start date (yyyy-mm-dd)') ?></label>
-        <?php echo object_input_date_tag($application, 'getStartedAt', 'name=application[started_at] format=Y-MM-dd rich=true class=date_select', $sf_params->get('application[started_at]')) ?>
-        <?php echo form_error('application[started_at]') ?>
-      </div>
-      <div class="form-row">
-        <label for="released_at"><?php echo __('Release date (yyyy-mm-dd)') ?></label>
-        <?php echo object_input_date_tag($application, 'getReleasedAt', 'name=application[released_at] format=Y-MM-dd rich=true class=date_select', $sf_params->get('application[released_at]')) ?>
-        <?php echo form_error('application[released_at]') ?>
-      </div>
-      */ ?>
-    </fieldset>
-  </div>
-  <div class="form-row" style="text-align:center;clear:left;">
-    <p>
+      <?php echo $form['_csrf_token'] ?>
-      <input type="submit" value="<?php echo $submit_label ?>" />
-    </p>

trunk/apps/main/modules/applications/templates/editSuccess.php

@@ -1 +1 @@
-<?php slot('page_title') ?>
-  <?php $page_title = __('Update %name% application informations', 
-application->getRawValue
+form->getObject
-  <?php echo $page_title ?>
-<?php end_slot() ?>
-
-<?php include_partial('applications/form',
-
+
+
-                            'title'        => $page_title,
-application
+form->getObject()
-                            'submit_label' => __('Update application informations'))) ?>

trunk/lib/form/application/ApplicationForm.class.php

@@ -11 +11 @@
-  public function configure()
-  {
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-  }
-}

trunk/lib/model/Application.php

@@ -163 +163 @@
-    $c->add(ApplicationDeveloperPeer::DEVELOPER_ID, $user);
-    return ($this->countApplicationDevelopers($c) > 0);
-  }
-
-  /**
-   * Sets is_featured field and update according relations
-   *
-   * @param  boolean $flag
-   */
-  public function setIsFeatured($flag)
-  {
-    if ($flag && !$this->getIsFeatured())
-    {
-      // Flag all apps as unfeatured
-      $c = new Criteria();
-      $c->add(ApplicationPeer::IS_FEATURED, false);
-      ApplicationPeer::doUpdate($c);
-    }
-    parent::setIsFeatured($flag);
-  }
-
-  /**
-   * Sets app homepage url
-   *
-   * @param  string $v
-   */
-  public function setHomepage($v)
-  {
-    if (trim(strtolower($v)) === 'http://')
-    {
-      $v = null;
-    }
-    parent::setHomepage($v);
-  }
-
-  /**
-   * Sets app feed url
-   *
-   * @param  string $v
-   */
-  public function setFeedUrl($v)
-  {
-    if (trim(strtolower($v)) === 'http://')
-    {
-      $v = null;
-    }
-    parent::setFeedUrl($v);
-  }
-
@@ -280 +235 @@
-    return $save;
-  }
+  
+  /**
+   * Sets the feed url value
+   *
+   * @param string $v
+   */
+  public function setFeedUrl($v)
+  {
+    if ('http://' == trim(strtolower($v)))
+    {
+      $v = null;
+    }
+    
+    return parent::setFeedUrl($v);
+  }
+  
+  /**
+   * Sets the homepage url value
+   *
+   * @param string $v
+   */
+  public function setHomepage($v)
+  {
+    if ('http://' == trim(strtolower($v)))
+    {
+      $v = null;
+    }
+    
+    return parent::setHomepage($v);
+  }
+  
+  /**
+   * Sets is_featured field and update according relations
+   *
+   * @param  boolean $flag
+   */
+  public function setIsFeatured($flag)
+  {
+    if ($flag && !$this->getIsFeatured())
+    {
+      // Flag all apps as unfeatured
+      $c = new Criteria();
+      $c->add(ApplicationPeer::IS_FEATURED, false);
+      ApplicationPeer::doUpdate($c);
+    }
+    parent::setIsFeatured($flag);
+  }
+  
+  /**
+   * Sets application tags, only if application has already been saved
+   *
+   * @param array|string $tags  Tags for the application
+   */
+  public function setTags($tags)
+  {
+    if ($this->isNew())
+    {
+      return;
+    }
+    
+    $this->removeAllTags();
+    $this->addTag($tags);
+  }
-
-}

trunk/lib/symfonians/ImagesTools.class.php

@@ -10 +10 @@
-   * Creates a thumbnail from an uploaded image file
-   * 
+   * @param  sfValidatedFile  Validated uploaded file
-   * @throws sfException  
-   */
-$source_field_nam
+sfValidatedFile $fil
-                                     $destination_dir, 
-                                     $filename, 
@@ -21 +22 @@
-                                     $options = array())
-  {
-    $request = sfContext::getInstance()->getRequest();
-    
-    sfContext::getInstance()->getLogger()->info('{ImagesTools} Thumbnail creation parameters: '.var_export(func_get_args(), true));
-    
-    if (!$request->hasFiles())
-    {
-      return null;
-    }
-    
-    if (!is_dir($destination_dir) && !@mkdir($destination_dir))
-    {
@@ -36 +28 @@
-    }
-    
-
-
-
-
-
-
-
-
-
-
-
+
-    
-    switch ($export_mime)
@@ -139 +121 @@
-      }
-    }
-$errors > 0
+($errors > 0)
-  }
-

trunk/web/css/style.css

@@ -696 +696 @@
-}
-
+div.date_select select {
+  width: inherit;
+}
+
-label {
-  display: block;