[dev] [commit] r962 - templates/admin templates/common templates/common/bits templates/common/paradigm/4.0 templates/common/paradigm/4.1 templates/common/paradigm/5.0 templates/common/paradigm/6.0 templates/flex wwwbase wwwbase/admin wwwbase/flex
automailer at dexonline.ro
automailer at dexonline.ro
Wed Aug 28 17:20:49 EEST 2013
Author: cata
Date: Wed Aug 28 17:20:49 2013
New Revision: 962
Log:
* Simplify paradigm.ihtml.
* Display model type names from the description field instead of hard-coded values.
Added:
templates/common/paradigm/4.0/paradigmF.ihtml (contents, props changed)
templates/common/paradigm/4.0/paradigmM.ihtml (contents, props changed)
templates/common/paradigm/4.0/paradigmSP.ihtml (contents, props changed)
templates/common/paradigm/4.1/paradigmF.ihtml (contents, props changed)
templates/common/paradigm/4.1/paradigmM.ihtml (contents, props changed)
templates/common/paradigm/4.1/paradigmSP.ihtml (contents, props changed)
templates/common/paradigm/5.0/paradigmF.ihtml (contents, props changed)
templates/common/paradigm/5.0/paradigmM.ihtml (contents, props changed)
templates/common/paradigm/6.0/paradigmF.ihtml (contents, props changed)
templates/common/paradigm/6.0/paradigmM.ihtml (contents, props changed)
templates/common/paradigm/6.0/paradigmSP.ihtml (contents, props changed)
Modified:
templates/admin/lexemEdit.ihtml
templates/common/bits/multiParadigm.ihtml
templates/common/modele-flexiune.ihtml
templates/common/paradigm/4.0/paradigm.ihtml
templates/common/paradigm/4.0/paradigmA.ihtml
templates/common/paradigm/4.0/paradigmI.ihtml
templates/common/paradigm/4.0/paradigmN.ihtml
templates/common/paradigm/4.0/paradigmP.ihtml
templates/common/paradigm/4.0/paradigmV.ihtml
templates/common/paradigm/4.1/paradigm.ihtml
templates/common/paradigm/4.1/paradigmA.ihtml
templates/common/paradigm/4.1/paradigmI.ihtml
templates/common/paradigm/4.1/paradigmN.ihtml
templates/common/paradigm/4.1/paradigmP.ihtml
templates/common/paradigm/4.1/paradigmV.ihtml
templates/common/paradigm/5.0/paradigm.ihtml
templates/common/paradigm/5.0/paradigmA.ihtml
templates/common/paradigm/5.0/paradigmI.ihtml
templates/common/paradigm/5.0/paradigmN.ihtml
templates/common/paradigm/5.0/paradigmP.ihtml
templates/common/paradigm/5.0/paradigmV.ihtml
templates/common/paradigm/6.0/paradigm.ihtml
templates/common/paradigm/6.0/paradigmA.ihtml
templates/common/paradigm/6.0/paradigmI.ihtml
templates/common/paradigm/6.0/paradigmN.ihtml
templates/common/paradigm/6.0/paradigmP.ihtml
templates/common/paradigm/6.0/paradigmV.ihtml
templates/common/tipuri-modele.ihtml
templates/flex/editModel.ihtml
wwwbase/admin/lexemEdit.php
wwwbase/flex/editModel.php
wwwbase/modele-flexiune.php
wwwbase/paradigm.php
wwwbase/search.php
Modified: templates/admin/lexemEdit.ihtml
==============================================================================
--- templates/admin/lexemEdit.ihtml Wed Aug 28 13:37:27 2013 (r961)
+++ templates/admin/lexemEdit.ihtml Wed Aug 28 17:20:49 2013 (r962)
@@ -187,7 +187,7 @@
{/if}
{if $ifMap}
- {include file="common/paradigm/current/paradigm.ihtml" lexem=$lexem ifMap=$ifMap}
+ {include file="common/paradigm/current/paradigm.ihtml" lexem=$lexem ifMap=$ifMap modelType=$modelType}
{/if}
<br/>
Modified: templates/common/bits/multiParadigm.ihtml
==============================================================================
--- templates/common/bits/multiParadigm.ihtml Wed Aug 28 13:37:27 2013 (r961)
+++ templates/common/bits/multiParadigm.ihtml Wed Aug 28 17:20:49 2013 (r962)
@@ -3,7 +3,7 @@
{assign var="version" value=$version|default:"current"}
{if $ifMaps}
{foreach from=$ifMaps item=ifMap key=i}
- {include file="common/paradigm/$version/paradigm.ihtml" lexem=$lexems[$i] ifMap=$ifMap sourceNames=$sourceNamesArr[$i]}
+ {include file="common/paradigm/$version/paradigm.ihtml" lexem=$lexems[$i] ifMap=$ifMap sourceNames=$sourceNamesArr[$i] modelType=$modelTypes[$i]}
{if $sUser && ($sUser->moderator & $smarty.const.PRIV_LOC)}
Editează:
<a href="{$wwwRoot}admin/lexemEdit.php?lexemId={$lexems[$i]->id}">lexemul</a> |
Modified: templates/common/modele-flexiune.ihtml
==============================================================================
--- templates/common/modele-flexiune.ihtml Wed Aug 28 13:37:27 2013 (r961)
+++ templates/common/modele-flexiune.ihtml Wed Aug 28 17:20:49 2013 (r962)
@@ -15,8 +15,7 @@
Model:
<select name="modelType" id="modelTypeListId" onchange="return updateModelList(true)">
{foreach from=$modelTypes item=mt}
- <option value="{$mt->code|escape}"
- {if $mt->code == $selectedModelType}selected="selected"{/if}>
+ <option value="{$mt->code|escape}" {if $mt->code == $selectedModelType->code}selected="selected"{/if}>
{$mt->code|escape} ({$mt->description|escape})
</option>
{/foreach}
@@ -43,6 +42,7 @@
</div>
{include file="common/paradigm/$selectedLocVersion/paradigm.ihtml"
lexem=$lexems[$i]
- ifMap=$paradigms[$i]}
+ ifMap=$paradigms[$i]
+ modelType=$selectedModelType}
{/foreach}
{/if}
Modified: templates/common/paradigm/4.0/paradigm.ihtml
==============================================================================
--- templates/common/paradigm/4.0/paradigm.ihtml Wed Aug 28 13:37:27 2013 (r961)
+++ templates/common/paradigm/4.0/paradigm.ihtml Wed Aug 28 17:20:49 2013 (r962)
@@ -4,57 +4,4 @@
$ifMap: HashMap($inflectionId -> Array(InflectedForm))
*}
-{assign var=modelType value=$modelType|default:$lexem->modelType}
-
-{if $modelType == 'T'}
- {include file="common/paradigm/4.0/paradigmT.ihtml" lexem=$lexem}
-{elseif $modelType == 'I'}
- {include file="common/paradigm/4.0/paradigmI.ihtml" lexem=$lexem ifMap=$ifMap}
-{elseif $modelType == 'A'}
- {include file="common/paradigm/4.0/paradigmA.ihtml"
- lexem=$lexem
- ifMap=$ifMap
- title="adjectiv"}
-{elseif $modelType == 'MF'}
- {include file="common/paradigm/4.0/paradigmA.ihtml"
- lexem=$lexem
- ifMap=$ifMap
- title="substantiv"}
-{elseif $modelType == 'M'}
- {include file="common/paradigm/4.0/paradigmN.ihtml"
- lexem=$lexem
- ifMap=$ifMap
- baseInflId=1
- title="substantiv masculin"}
-{elseif $modelType == 'F'}
- {include file="common/paradigm/4.0/paradigmN.ihtml"
- lexem=$lexem
- ifMap=$ifMap
- baseInflId=9
- title="substantiv feminin"}
-{elseif $modelType == 'N'}
- {include file="common/paradigm/4.0/paradigmN.ihtml"
- lexem=$lexem
- ifMap=$ifMap
- baseInflId=17
- title="substantiv neutru"}
-{elseif $modelType == 'P'}
- {include file="common/paradigm/4.0/paradigmP.ihtml"
- lexem=$lexem
- ifMap=$ifMap}
-{elseif $modelType == 'V'}
- {include file="common/paradigm/4.0/paradigmV.ihtml"
- lexem=$lexem
- ifMap=$ifMap
- title="verb"}
-{elseif $modelType == 'VT'}
- {include file="common/paradigm/4.0/paradigmV.ihtml"
- lexem=$lexem
- ifMap=$ifMap
- title="verb tranzitiv"}
-{else}
- <div class="lexem">
- Nu pot afișa flexiunea lexemului
- <span class="lexemName">{$lexem->formNoAccent|escape}</span>.
- </div>
-{/if}
+{include file="common/paradigm/4.0/paradigm`$modelType->canonical`.ihtml" lexem=$lexem ifMap=$ifMap modelType=$modelType}
Modified: templates/common/paradigm/4.0/paradigmA.ihtml
==============================================================================
--- templates/common/paradigm/4.0/paradigmA.ihtml Wed Aug 28 13:37:27 2013 (r961)
+++ templates/common/paradigm/4.0/paradigmA.ihtml Wed Aug 28 17:20:49 2013 (r962)
@@ -6,7 +6,7 @@
<span class="lexemName"
>{include file="common/bits/lexemName.ihtml" lexem=$lexem
}</span>
- {$title|escape}
+ {$modelType->description|escape}
{include file="common/bits/locInfo.ihtml" lexem=$lexem}
{include file="common/bits/lexemTags.ihtml" lexem=$lexem}
</td>
Added: templates/common/paradigm/4.0/paradigmF.ihtml
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ templates/common/paradigm/4.0/paradigmF.ihtml Wed Aug 28 17:20:49 2013 (r962)
@@ -0,0 +1 @@
+link paradigmN.ihtml
\ No newline at end of file
Modified: templates/common/paradigm/4.0/paradigmI.ihtml
==============================================================================
--- templates/common/paradigm/4.0/paradigmI.ihtml Wed Aug 28 13:37:27 2013 (r961)
+++ templates/common/paradigm/4.0/paradigmI.ihtml Wed Aug 28 17:20:49 2013 (r962)
@@ -2,7 +2,7 @@
<span class="lexemName"
>{include file="common/bits/lexemName.ihtml" lexem=$lexem
}</span>
- invariabil
+ {$modelType->description|escape}
{include file="common/bits/locInfo.ihtml" lexem=$lexem}
{include file="common/bits/lexemTags.ihtml" lexem=$lexem}
</div>
Added: templates/common/paradigm/4.0/paradigmM.ihtml
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ templates/common/paradigm/4.0/paradigmM.ihtml Wed Aug 28 17:20:49 2013 (r962)
@@ -0,0 +1 @@
+link paradigmN.ihtml
\ No newline at end of file
Modified: templates/common/paradigm/4.0/paradigmN.ihtml
==============================================================================
--- templates/common/paradigm/4.0/paradigmN.ihtml Wed Aug 28 13:37:27 2013 (r961)
+++ templates/common/paradigm/4.0/paradigmN.ihtml Wed Aug 28 17:20:49 2013 (r962)
@@ -4,7 +4,7 @@
<span class="lexemName"
>{include file="common/bits/lexemName.ihtml" lexem=$lexem
}</span>
- {$title|escape}
+ {$modelType->description|escape}
{include file="common/bits/locInfo.ihtml" lexem=$lexem}
{include file="common/bits/lexemTags.ihtml" lexem=$lexem}
</td>
Modified: templates/common/paradigm/4.0/paradigmP.ihtml
==============================================================================
--- templates/common/paradigm/4.0/paradigmP.ihtml Wed Aug 28 13:37:27 2013 (r961)
+++ templates/common/paradigm/4.0/paradigmP.ihtml Wed Aug 28 17:20:49 2013 (r962)
@@ -6,7 +6,7 @@
<span class="lexemName"
>{include file="common/bits/lexemName.ihtml" lexem=$lexem
}</span>
- articol / numeral / adjectiv pronominal / pronume
+ {$modelType->description|escape}
{include file="common/bits/locInfo.ihtml" lexem=$lexem}
{include file="common/bits/lexemTags.ihtml" lexem=$lexem}
</td>
Added: templates/common/paradigm/4.0/paradigmSP.ihtml
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ templates/common/paradigm/4.0/paradigmSP.ihtml Wed Aug 28 17:20:49 2013 (r962)
@@ -0,0 +1 @@
+link paradigmN.ihtml
\ No newline at end of file
Modified: templates/common/paradigm/4.0/paradigmV.ihtml
==============================================================================
--- templates/common/paradigm/4.0/paradigmV.ihtml Wed Aug 28 13:37:27 2013 (r961)
+++ templates/common/paradigm/4.0/paradigmV.ihtml Wed Aug 28 17:20:49 2013 (r962)
@@ -7,7 +7,7 @@
<span class="lexemName"
>{include file="common/bits/lexemName.ihtml" lexem=$lexem
}</span>
- {$title|escape}
+ {$modelType->description|escape}
{include file="common/bits/locInfo.ihtml" lexem=$lexem}
{include file="common/bits/lexemTags.ihtml" lexem=$lexem}
</td>
Modified: templates/common/paradigm/4.1/paradigm.ihtml
==============================================================================
--- templates/common/paradigm/4.1/paradigm.ihtml Wed Aug 28 13:37:27 2013 (r961)
+++ templates/common/paradigm/4.1/paradigm.ihtml Wed Aug 28 17:20:49 2013 (r962)
@@ -1,60 +1,7 @@
{* Arguments:
$lexem: Lexem;
- $modelType: String; (optional; if missing, use $lexem->modelType)
+ $modelType: ModelType;
$ifMap: HashMap($inflectionId -> Array(InflectedForm))
*}
-{assign var=modelType value=$modelType|default:$lexem->modelType}
-
-{if $modelType == 'T'}
- {include file="common/paradigm/4.1/paradigmT.ihtml" lexem=$lexem}
-{elseif $modelType == 'I'}
- {include file="common/paradigm/4.1/paradigmI.ihtml" lexem=$lexem ifMap=$ifMap}
-{elseif $modelType == 'A'}
- {include file="common/paradigm/4.1/paradigmA.ihtml"
- lexem=$lexem
- ifMap=$ifMap
- title="adjectiv"}
-{elseif $modelType == 'MF'}
- {include file="common/paradigm/4.1/paradigmA.ihtml"
- lexem=$lexem
- ifMap=$ifMap
- title="substantiv"}
-{elseif $modelType == 'M'}
- {include file="common/paradigm/4.1/paradigmN.ihtml"
- lexem=$lexem
- ifMap=$ifMap
- baseInflId=1
- title="substantiv masculin"}
-{elseif $modelType == 'F'}
- {include file="common/paradigm/4.1/paradigmN.ihtml"
- lexem=$lexem
- ifMap=$ifMap
- baseInflId=9
- title="substantiv feminin"}
-{elseif $modelType == 'N'}
- {include file="common/paradigm/4.1/paradigmN.ihtml"
- lexem=$lexem
- ifMap=$ifMap
- baseInflId=17
- title="substantiv neutru"}
-{elseif $modelType == 'P'}
- {include file="common/paradigm/4.1/paradigmP.ihtml"
- lexem=$lexem
- ifMap=$ifMap}
-{elseif $modelType == 'V'}
- {include file="common/paradigm/4.1/paradigmV.ihtml"
- lexem=$lexem
- ifMap=$ifMap
- title="verb"}
-{elseif $modelType == 'VT'}
- {include file="common/paradigm/4.1/paradigmV.ihtml"
- lexem=$lexem
- ifMap=$ifMap
- title="verb tranzitiv"}
-{else}
- <div class="lexem">
- Nu pot afișa flexiunea lexemului
- <span class="lexemName">{$lexem->formNoAccent|escape}</span>.
- </div>
-{/if}
+{include file="common/paradigm/4.1/paradigm`$modelType->canonical`.ihtml" lexem=$lexem ifMap=$ifMap modelType=$modelType}
Modified: templates/common/paradigm/4.1/paradigmA.ihtml
==============================================================================
--- templates/common/paradigm/4.1/paradigmA.ihtml Wed Aug 28 13:37:27 2013 (r961)
+++ templates/common/paradigm/4.1/paradigmA.ihtml Wed Aug 28 17:20:49 2013 (r962)
@@ -6,7 +6,7 @@
<span class="lexemName"
>{include file="common/bits/lexemName.ihtml" lexem=$lexem
}</span>
- {$title|escape}
+ {$modelType->description|escape}
{include file="common/bits/locInfo.ihtml" lexem=$lexem}
{include file="common/bits/lexemTags.ihtml" lexem=$lexem}
</td>
Added: templates/common/paradigm/4.1/paradigmF.ihtml
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ templates/common/paradigm/4.1/paradigmF.ihtml Wed Aug 28 17:20:49 2013 (r962)
@@ -0,0 +1 @@
+link paradigmN.ihtml
\ No newline at end of file
Modified: templates/common/paradigm/4.1/paradigmI.ihtml
==============================================================================
--- templates/common/paradigm/4.1/paradigmI.ihtml Wed Aug 28 13:37:27 2013 (r961)
+++ templates/common/paradigm/4.1/paradigmI.ihtml Wed Aug 28 17:20:49 2013 (r962)
@@ -2,7 +2,7 @@
<span class="lexemName"
>{include file="common/bits/lexemName.ihtml" lexem=$lexem
}</span>
- invariabil
+ {$modelType->description|escape}
{include file="common/bits/locInfo.ihtml" lexem=$lexem}
{include file="common/bits/lexemTags.ihtml" lexem=$lexem}
</div>
Added: templates/common/paradigm/4.1/paradigmM.ihtml
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ templates/common/paradigm/4.1/paradigmM.ihtml Wed Aug 28 17:20:49 2013 (r962)
@@ -0,0 +1 @@
+link paradigmN.ihtml
\ No newline at end of file
Modified: templates/common/paradigm/4.1/paradigmN.ihtml
==============================================================================
--- templates/common/paradigm/4.1/paradigmN.ihtml Wed Aug 28 13:37:27 2013 (r961)
+++ templates/common/paradigm/4.1/paradigmN.ihtml Wed Aug 28 17:20:49 2013 (r962)
@@ -4,7 +4,7 @@
<span class="lexemName"
>{include file="common/bits/lexemName.ihtml" lexem=$lexem
}</span>
- {$title|escape}
+ {$modelType->description|escape}
{include file="common/bits/locInfo.ihtml" lexem=$lexem}
{include file="common/bits/lexemTags.ihtml" lexem=$lexem}
</td>
Modified: templates/common/paradigm/4.1/paradigmP.ihtml
==============================================================================
--- templates/common/paradigm/4.1/paradigmP.ihtml Wed Aug 28 13:37:27 2013 (r961)
+++ templates/common/paradigm/4.1/paradigmP.ihtml Wed Aug 28 17:20:49 2013 (r962)
@@ -6,7 +6,7 @@
<span class="lexemName"
>{include file="common/bits/lexemName.ihtml" lexem=$lexem
}</span>
- articol / numeral / adjectiv pronominal / pronume
+ {$modelType->description|escape}
{include file="common/bits/locInfo.ihtml" lexem=$lexem}
{include file="common/bits/lexemTags.ihtml" lexem=$lexem}
</td>
Added: templates/common/paradigm/4.1/paradigmSP.ihtml
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ templates/common/paradigm/4.1/paradigmSP.ihtml Wed Aug 28 17:20:49 2013 (r962)
@@ -0,0 +1 @@
+link paradigmN.ihtml
\ No newline at end of file
Modified: templates/common/paradigm/4.1/paradigmV.ihtml
==============================================================================
--- templates/common/paradigm/4.1/paradigmV.ihtml Wed Aug 28 13:37:27 2013 (r961)
+++ templates/common/paradigm/4.1/paradigmV.ihtml Wed Aug 28 17:20:49 2013 (r962)
@@ -7,7 +7,7 @@
<span class="lexemName"
>{include file="common/bits/lexemName.ihtml" lexem=$lexem
}</span>
- {$title|escape}
+ {$modelType->description|escape}
{include file="common/bits/locInfo.ihtml" lexem=$lexem}
{include file="common/bits/lexemTags.ihtml" lexem=$lexem}
</td>
Modified: templates/common/paradigm/5.0/paradigm.ihtml
==============================================================================
--- templates/common/paradigm/5.0/paradigm.ihtml Wed Aug 28 13:37:27 2013 (r961)
+++ templates/common/paradigm/5.0/paradigm.ihtml Wed Aug 28 17:20:49 2013 (r962)
@@ -1,33 +1,7 @@
{* Arguments:
$lexem: Lexem;
- $modelType: String; (optional; if missing, use $lexem->modelType)
+ $modelType: ModelType;
$ifMap: HashMap($rank -> Array(InflectedForm))
*}
-{assign var=modelType value=$modelType|default:$lexem->modelType}
-
-{if $modelType == 'T'}
- {include file="common/paradigm/current/paradigmT.ihtml" lexem=$lexem}
-{elseif $modelType == 'I'}
- {include file="common/paradigm/current/paradigmI.ihtml" lexem=$lexem ifMap=$ifMap}
-{elseif $modelType == 'A'}
- {include file="common/paradigm/current/paradigmA.ihtml" lexem=$lexem ifMap=$ifMap title="adjectiv"}
-{elseif $modelType == 'MF'}
- {include file="common/paradigm/current/paradigmA.ihtml" lexem=$lexem ifMap=$ifMap title="substantiv"}
-{elseif $modelType == 'M'}
- {include file="common/paradigm/current/paradigmN.ihtml" lexem=$lexem ifMap=$ifMap title="substantiv masculin"}
-{elseif $modelType == 'F'}
- {include file="common/paradigm/current/paradigmN.ihtml" lexem=$lexem ifMap=$ifMap title="substantiv feminin"}
-{elseif $modelType == 'N'}
- {include file="common/paradigm/current/paradigmN.ihtml" lexem=$lexem ifMap=$ifMap title="substantiv neutru"}
-{elseif $modelType == 'P'}
- {include file="common/paradigm/current/paradigmP.ihtml" lexem=$lexem ifMap=$ifMap}
-{elseif $modelType == 'V'}
- {include file="common/paradigm/current/paradigmV.ihtml" lexem=$lexem ifMap=$ifMap title="verb"}
-{elseif $modelType == 'VT'}
- {include file="common/paradigm/current/paradigmV.ihtml" lexem=$lexem ifMap=$ifMap title="verb tranzitiv"}
-{else}
- <div class="lexem">
- Nu pot afișa flexiunea lexemului <span class="lexemName">{$lexem->formNoAccent|escape}</span>.
- </div>
-{/if}
+{include file="common/paradigm/5.0/paradigm`$modelType->canonical`.ihtml" lexem=$lexem ifMap=$ifMap modelType=$modelType}
Modified: templates/common/paradigm/5.0/paradigmA.ihtml
==============================================================================
--- templates/common/paradigm/5.0/paradigmA.ihtml Wed Aug 28 13:37:27 2013 (r961)
+++ templates/common/paradigm/5.0/paradigmA.ihtml Wed Aug 28 17:20:49 2013 (r962)
@@ -4,7 +4,7 @@
<span class="lexemName"
>{include file="common/bits/lexemName.ihtml" lexem=$lexem
}</span>
- {$title|escape}
+ {$modelType->description|escape}
{include file="common/bits/locInfo.ihtml" lexem=$lexem}
{include file="common/bits/lexemTags.ihtml" lexem=$lexem}
</td>
Added: templates/common/paradigm/5.0/paradigmF.ihtml
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ templates/common/paradigm/5.0/paradigmF.ihtml Wed Aug 28 17:20:49 2013 (r962)
@@ -0,0 +1 @@
+link paradigmN.ihtml
\ No newline at end of file
Modified: templates/common/paradigm/5.0/paradigmI.ihtml
==============================================================================
--- templates/common/paradigm/5.0/paradigmI.ihtml Wed Aug 28 13:37:27 2013 (r961)
+++ templates/common/paradigm/5.0/paradigmI.ihtml Wed Aug 28 17:20:49 2013 (r962)
@@ -2,7 +2,7 @@
<span class="lexemName"
>{include file="common/bits/lexemName.ihtml" lexem=$lexem
}</span>
- invariabil
+ {$modelType->description|escape}
{include file="common/bits/locInfo.ihtml" lexem=$lexem}
{include file="common/bits/lexemTags.ihtml" lexem=$lexem}
</div>
Added: templates/common/paradigm/5.0/paradigmM.ihtml
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ templates/common/paradigm/5.0/paradigmM.ihtml Wed Aug 28 17:20:49 2013 (r962)
@@ -0,0 +1 @@
+link paradigmN.ihtml
\ No newline at end of file
Modified: templates/common/paradigm/5.0/paradigmN.ihtml
==============================================================================
--- templates/common/paradigm/5.0/paradigmN.ihtml Wed Aug 28 13:37:27 2013 (r961)
+++ templates/common/paradigm/5.0/paradigmN.ihtml Wed Aug 28 17:20:49 2013 (r962)
@@ -4,7 +4,7 @@
<span class="lexemName"
>{include file="common/bits/lexemName.ihtml" lexem=$lexem
}</span>
- {$title|escape}
+ {$modelType->description|escape}
{include file="common/bits/locInfo.ihtml" lexem=$lexem}
{include file="common/bits/lexemTags.ihtml" lexem=$lexem}
</td>
Modified: templates/common/paradigm/5.0/paradigmP.ihtml
==============================================================================
--- templates/common/paradigm/5.0/paradigmP.ihtml Wed Aug 28 13:37:27 2013 (r961)
+++ templates/common/paradigm/5.0/paradigmP.ihtml Wed Aug 28 17:20:49 2013 (r962)
@@ -4,7 +4,7 @@
<span class="lexemName"
>{include file="common/bits/lexemName.ihtml" lexem=$lexem
}</span>
- articol / numeral / adjectiv pronominal / pronume
+ {$modelType->description|escape}
{include file="common/bits/locInfo.ihtml" lexem=$lexem}
{include file="common/bits/lexemTags.ihtml" lexem=$lexem}
</td>
Modified: templates/common/paradigm/5.0/paradigmV.ihtml
==============================================================================
--- templates/common/paradigm/5.0/paradigmV.ihtml Wed Aug 28 13:37:27 2013 (r961)
+++ templates/common/paradigm/5.0/paradigmV.ihtml Wed Aug 28 17:20:49 2013 (r962)
@@ -4,7 +4,7 @@
<span class="lexemName"
>{include file="common/bits/lexemName.ihtml" lexem=$lexem
}</span>
- {$title|escape}
+ {$modelType->description|escape}
{include file="common/bits/locInfo.ihtml" lexem=$lexem}
{include file="common/bits/lexemTags.ihtml" lexem=$lexem}
</td>
Modified: templates/common/paradigm/6.0/paradigm.ihtml
==============================================================================
--- templates/common/paradigm/6.0/paradigm.ihtml Wed Aug 28 13:37:27 2013 (r961)
+++ templates/common/paradigm/6.0/paradigm.ihtml Wed Aug 28 17:20:49 2013 (r962)
@@ -1,35 +1,7 @@
{* Arguments:
$lexem: Lexem;
- $modelType: String; (optional; if missing, use $lexem->modelType)
+ $modelType: ModelType;
$ifMap: HashMap($rank -> Array(InflectedForm))
*}
-{assign var=modelType value=$modelType|default:$lexem->modelType}
-
-{if $modelType == 'T'}
- {include file="common/paradigm/current/paradigmT.ihtml" lexem=$lexem}
-{elseif $modelType == 'I'}
- {include file="common/paradigm/current/paradigmI.ihtml" lexem=$lexem ifMap=$ifMap}
-{elseif $modelType == 'A'}
- {include file="common/paradigm/current/paradigmA.ihtml" lexem=$lexem ifMap=$ifMap title="adjectiv"}
-{elseif $modelType == 'MF'}
- {include file="common/paradigm/current/paradigmA.ihtml" lexem=$lexem ifMap=$ifMap title="substantiv"}
-{elseif $modelType == 'M'}
- {include file="common/paradigm/current/paradigmN.ihtml" lexem=$lexem ifMap=$ifMap title="substantiv masculin"}
-{elseif $modelType == 'F'}
- {include file="common/paradigm/current/paradigmN.ihtml" lexem=$lexem ifMap=$ifMap title="substantiv feminin"}
-{elseif $modelType == 'N'}
- {include file="common/paradigm/current/paradigmN.ihtml" lexem=$lexem ifMap=$ifMap title="substantiv neutru"}
-{elseif $modelType == 'SP'}
- {include file="common/paradigm/current/paradigmN.ihtml" lexem=$lexem ifMap=$ifMap title="substantiv propriu"}
-{elseif $modelType == 'P'}
- {include file="common/paradigm/current/paradigmP.ihtml" lexem=$lexem ifMap=$ifMap}
-{elseif $modelType == 'V'}
- {include file="common/paradigm/current/paradigmV.ihtml" lexem=$lexem ifMap=$ifMap title="verb"}
-{elseif $modelType == 'VT'}
- {include file="common/paradigm/current/paradigmV.ihtml" lexem=$lexem ifMap=$ifMap title="verb tranzitiv"}
-{else}
- <div class="lexem">
- Nu pot afișa flexiunea lexemului <span class="lexemName">{$lexem->formNoAccent|escape}</span>.
- </div>
-{/if}
+{include file="common/paradigm/current/paradigm`$modelType->canonical`.ihtml" lexem=$lexem ifMap=$ifMap modelType=$modelType}
Modified: templates/common/paradigm/6.0/paradigmA.ihtml
==============================================================================
--- templates/common/paradigm/6.0/paradigmA.ihtml Wed Aug 28 13:37:27 2013 (r961)
+++ templates/common/paradigm/6.0/paradigmA.ihtml Wed Aug 28 17:20:49 2013 (r962)
@@ -4,7 +4,7 @@
<span class="lexemName"
>{include file="common/bits/lexemName.ihtml" lexem=$lexem
}</span>
- {$title|escape}
+ {$modelType->description|escape}
{include file="common/bits/locInfo.ihtml" lexem=$lexem}
{include file="common/bits/lexemTags.ihtml" lexem=$lexem}
</td>
Added: templates/common/paradigm/6.0/paradigmF.ihtml
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ templates/common/paradigm/6.0/paradigmF.ihtml Wed Aug 28 17:20:49 2013 (r962)
@@ -0,0 +1 @@
+link paradigmN.ihtml
\ No newline at end of file
Modified: templates/common/paradigm/6.0/paradigmI.ihtml
==============================================================================
--- templates/common/paradigm/6.0/paradigmI.ihtml Wed Aug 28 13:37:27 2013 (r961)
+++ templates/common/paradigm/6.0/paradigmI.ihtml Wed Aug 28 17:20:49 2013 (r962)
@@ -2,7 +2,7 @@
<span class="lexemName"
>{include file="common/bits/lexemName.ihtml" lexem=$lexem
}</span>
- invariabil
+ {$modelType->description|escape}
{include file="common/bits/locInfo.ihtml" lexem=$lexem}
{include file="common/bits/lexemTags.ihtml" lexem=$lexem}
</div>
Added: templates/common/paradigm/6.0/paradigmM.ihtml
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ templates/common/paradigm/6.0/paradigmM.ihtml Wed Aug 28 17:20:49 2013 (r962)
@@ -0,0 +1 @@
+link paradigmN.ihtml
\ No newline at end of file
Modified: templates/common/paradigm/6.0/paradigmN.ihtml
==============================================================================
--- templates/common/paradigm/6.0/paradigmN.ihtml Wed Aug 28 13:37:27 2013 (r961)
+++ templates/common/paradigm/6.0/paradigmN.ihtml Wed Aug 28 17:20:49 2013 (r962)
@@ -4,7 +4,7 @@
<span class="lexemName"
>{include file="common/bits/lexemName.ihtml" lexem=$lexem
}</span>
- {$title|escape}
+ {$modelType->description|escape}
{include file="common/bits/locInfo.ihtml" lexem=$lexem}
{include file="common/bits/lexemTags.ihtml" lexem=$lexem}
</td>
Modified: templates/common/paradigm/6.0/paradigmP.ihtml
==============================================================================
--- templates/common/paradigm/6.0/paradigmP.ihtml Wed Aug 28 13:37:27 2013 (r961)
+++ templates/common/paradigm/6.0/paradigmP.ihtml Wed Aug 28 17:20:49 2013 (r962)
@@ -4,7 +4,7 @@
<span class="lexemName"
>{include file="common/bits/lexemName.ihtml" lexem=$lexem
}</span>
- articol / numeral / adjectiv pronominal / pronume
+ {$modelType->description|escape}
{include file="common/bits/locInfo.ihtml" lexem=$lexem}
{include file="common/bits/lexemTags.ihtml" lexem=$lexem}
</td>
Added: templates/common/paradigm/6.0/paradigmSP.ihtml
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ templates/common/paradigm/6.0/paradigmSP.ihtml Wed Aug 28 17:20:49 2013 (r962)
@@ -0,0 +1 @@
+link paradigmN.ihtml
\ No newline at end of file
Modified: templates/common/paradigm/6.0/paradigmV.ihtml
==============================================================================
--- templates/common/paradigm/6.0/paradigmV.ihtml Wed Aug 28 13:37:27 2013 (r961)
+++ templates/common/paradigm/6.0/paradigmV.ihtml Wed Aug 28 17:20:49 2013 (r962)
@@ -4,7 +4,7 @@
<span class="lexemName"
>{include file="common/bits/lexemName.ihtml" lexem=$lexem
}</span>
- {$title|escape}
+ {$modelType->description|escape}
{include file="common/bits/locInfo.ihtml" lexem=$lexem}
{include file="common/bits/lexemTags.ihtml" lexem=$lexem}
</td>
Modified: templates/common/tipuri-modele.ihtml
==============================================================================
--- templates/common/tipuri-modele.ihtml Wed Aug 28 13:37:27 2013 (r961)
+++ templates/common/tipuri-modele.ihtml Wed Aug 28 17:20:49 2013 (r962)
@@ -1,13 +1,14 @@
{if $showAddForm}
<h3>Adaugă un tip de model nou</h3>
+ Notă: prin această interfață nu se pot crea tipuri de model canonice, ci doar redirectări la alte tipuri.<br/><br/>
+
<form method="post" action="tipuri-modele.php">
<input type="hidden" name="id" value="0"/>
cod: <input type="text" name="code" value="{$addModelType->code}" size="10" maxlength="10"/><br/>
cod canonic:
<select name="canonical">
- <option value="">modelul este canonic</option>
{foreach from=$canonicalModelTypes item=mt}
<option value="{$mt->code}">{$mt->code}</option>
{/foreach}
Modified: templates/flex/editModel.ihtml
==============================================================================
--- templates/flex/editModel.ihtml Wed Aug 28 13:37:27 2013 (r961)
+++ templates/flex/editModel.ihtml Wed Aug 28 17:20:49 2013 (r962)
@@ -9,7 +9,7 @@
{/if}
<form action="editModel.php" method="post">
- <input type="hidden" name="modelType" value="{$modelType}"/>
+ <input type="hidden" name="modelType" value="{$modelType->code}"/>
<input type="hidden" name="modelNumber" value="{$modelNumber}"/>
<table class="editModel">
@@ -182,7 +182,7 @@
{include file="common/paradigm/current/paradigm.ihtml"
lexem=$p
ifMap=$participleParadigms[$i]
- modelType="A"}
+ modelType=$adjModelType}
{/if}
{/foreach}
{/if}
Modified: wwwbase/admin/lexemEdit.php
==============================================================================
--- wwwbase/admin/lexemEdit.php Wed Aug 28 13:37:27 2013 (r961)
+++ wwwbase/admin/lexemEdit.php Wed Aug 28 17:20:49 2013 (r962)
@@ -119,6 +119,7 @@
);
SmartyWrap::assign('lexem', $lexem);
+SmartyWrap::assign('modelType', ModelType::get_by_code($lexem->modelType));
SmartyWrap::assign('lexemSourceIdMap', util_makeSet($lexemSourceIds));
SmartyWrap::assign('searchResults', $searchResults);
SmartyWrap::assign('definitionLexem', $definitionLexem);
Modified: wwwbase/flex/editModel.php
==============================================================================
--- wwwbase/flex/editModel.php Wed Aug 28 13:37:27 2013 (r961)
+++ wwwbase/flex/editModel.php Wed Aug 28 17:20:49 2013 (r962)
@@ -12,12 +12,13 @@
$confirmButton = util_getRequestParameter('confirmButton');
$modelType = ModelType::canonicalize($modelType);
+$modelType = ModelType::get_by_code($modelType); // Work with the ModelType object from now on
-$inflections = Model::factory('Inflection')->where('modelType', $modelType)->order_by_asc('rank')->find_many();
+$inflections = Model::factory('Inflection')->where('modelType', $modelType->code)->order_by_asc('rank')->find_many();
// Load the original data
-$model = Model::factory('FlexModel')->where('modelType', $modelType)->where('number', $modelNumber)->find_one();
+$model = Model::factory('FlexModel')->where('modelType', $modelType->code)->where('number', $modelNumber)->find_one();
$exponent = $model->exponent;
-$lexem = Lexem::create($exponent, $modelType, $modelNumber, '');
+$lexem = Lexem::create($exponent, $modelType->code, $modelNumber, '');
$ifs = $lexem->generateParadigm();
$mdMap = ModelDescription::getByModelIdMapByInflectionIdVariantApplOrder($model->id);
$forms = array();
@@ -30,7 +31,7 @@
'recommended' => $mdMap[$if->inflectionId][$if->variant][0]->recommended);
}
-$participleNumber = ($modelType == 'V') ? ParticipleModel::loadByVerbModel($modelNumber)->adjectiveModel : '';
+$participleNumber = ($modelType->code == 'V') ? ParticipleModel::loadByVerbModel($modelNumber)->adjectiveModel : '';
if ($previewButton || $confirmButton) {
// Load the new forms and exponent;
@@ -58,15 +59,15 @@
$errorMessage = array();
if ($newModelNumber != $modelNumber) {
// Disallow duplicate model numbers
- $m = FlexModel::loadCanonicalByTypeNumber($modelType, $newModelNumber);
+ $m = FlexModel::loadCanonicalByTypeNumber($modelType->code, $newModelNumber);
if ($m) {
- $errorMessage[] = "Modelul $modelType$newModelNumber există deja.";
+ $errorMessage[] = "Modelul {$modelType->code}{$newModelNumber} există deja.";
}
}
if ($previewButton || $confirmButton) {
// Compare the old and new lists. Extract the transforms where needed.
- $isPronoun = ($modelType == 'P');
+ $isPronoun = ($modelType->code == 'P');
$regenTransforms = array();
// Recalculate transforms when
// (1) the form list has changed OR
@@ -92,7 +93,7 @@
// Now load the affected lexems. For each lexem, inflection and transform
// list, generate a new form.
- $lexems = Lexem::loadByCanonicalModel($modelType, $modelNumber);
+ $lexems = Lexem::loadByCanonicalModel($modelType->code, $modelNumber);
$regenForms = array();
foreach ($lexems as $l) {
$regenRow = array();
@@ -201,11 +202,11 @@
}
if ($modelNumber != $newModelNumber) {
- if ($modelType == 'V') {
+ if ($modelType->code == 'V') {
$oldPm = ParticipleModel::loadByVerbModel($modelNumber);
$oldPm->verbModel = $newModelNumber;
$oldPm->save();
- } else if ($modelType == 'A') {
+ } else if ($modelType->code == 'A') {
// Update all participle models that use this adjective model
db_execute("update ParticipleModel set adjectivModel = '%s' where adjectivModel = '%s'", addslashes($newModelNumber), addslashes($modelNumber));
}
@@ -243,7 +244,7 @@
SmartyWrap::assign('regenTransforms', $regenTransforms);
}
-if ($modelType == 'V') {
+if ($modelType->code == 'V') {
SmartyWrap::assign('adjModels', FlexModel::loadByType('A'));
}
@@ -262,6 +263,7 @@
SmartyWrap::assign('inflections', $inflections);
SmartyWrap::assign('inflectionMap', Inflection::mapById($inflections));
SmartyWrap::assign('modelType', $modelType);
+SmartyWrap::assign('adjModelType', ModelType::get_by_code('A'));
SmartyWrap::assign('modelNumber', $modelNumber);
SmartyWrap::assign('newModelNumber', $newModelNumber);
SmartyWrap::assign('exponent', $exponent);
@@ -275,7 +277,7 @@
SmartyWrap::assign('recentLinks', RecentLink::loadForUser());
SmartyWrap::assign('wasPreviewed', $previewButton);
SmartyWrap::assign('errorMessage', $errorMessage);
-SmartyWrap::assign('sectionTitle', "Editare model {$modelType}{$modelNumber}");
+SmartyWrap::assign('sectionTitle', "Editare model {$modelType->code}{$modelNumber}");
SmartyWrap::addCss('paradigm', 'jqueryui');
SmartyWrap::addJs('jquery', 'jqueryui');
SmartyWrap::displayAdminPage('flex/editModel.ihtml');
Modified: wwwbase/modele-flexiune.php
==============================================================================
--- wwwbase/modele-flexiune.php Wed Aug 28 13:37:27 2013 (r961)
+++ wwwbase/modele-flexiune.php Wed Aug 28 17:20:49 2013 (r962)
@@ -8,6 +8,7 @@
$modelNumber = util_getRequestParameter('modelNumber');
$locVersions = pref_getLocVersions();
+$modelType = ModelType::get_by_code($modelType); // Use the ModelType object from this point on
if ($locVersion && $modelType && $modelNumber) {
SmartyWrap::assign('selectedLocVersion', $locVersion);
@@ -17,22 +18,22 @@
LocVersion::changeDatabase($locVersion);
if ($modelNumber == -1) {
- $modelsToDisplay = FlexModel::loadByType($modelType);
+ $modelsToDisplay = FlexModel::loadByType($modelType->code);
} else {
- $modelsToDisplay = array(Model::factory('FlexModel')->where('modelType', $modelType)->where('number', $modelNumber)->find_one());
+ $modelsToDisplay = array(Model::factory('FlexModel')->where('modelType', $modelType->code)->where('number', $modelNumber)->find_one());
}
$lexems = array();
$paradigms = array();
foreach ($modelsToDisplay as $m) {
// Load by canonical model, so if $modelType is V, look for a lexem with type V or VT.
- $l = Model::factory('Lexem')->select('Lexem.*')->join('ModelType', 'modelType = code', 'mt')->where('mt.canonical', $modelType)
+ $l = Model::factory('Lexem')->select('Lexem.*')->join('ModelType', 'modelType = code', 'mt')->where('mt.canonical', $modelType->code)
->where('modelNumber', $m->number)->where('form', $m->exponent)->limit(1)->find_one();
if ($l) {
$paradigm = getExistingForms($l->id, $locVersion);
} else {
- $l = Lexem::create($m->exponent, $modelType, $m->number, '');
+ $l = Lexem::create($m->exponent, $modelType->code, $m->number, '');
$l->isLoc = true;
$paradigm = getNewForms($l, $locVersion);
}
@@ -49,7 +50,7 @@
}
$modelTypes = ModelType::loadCanonical();
-$models = FlexModel::loadByType($modelType ? $modelType : $modelTypes[0]->code);
+$models = FlexModel::loadByType($modelType ? $modelType->code : $modelTypes[0]->code);
SmartyWrap::assign('page_title', 'Modele de flexiune');
SmartyWrap::assign('locVersions', $locVersions);
Modified: wwwbase/paradigm.php
==============================================================================
--- wwwbase/paradigm.php Wed Aug 28 13:37:27 2013 (r961)
+++ wwwbase/paradigm.php Wed Aug 28 17:20:49 2013 (r962)
@@ -23,10 +23,10 @@
$lexem = Lexem::get_by_id($lexemId);
if ($lexem) {
$lexems = array($lexem);
- $cuv = $lexem->formNoAccent;
+ $cuv = $lexem->formNoAccent;
} else {
$lexems = array();
- $cuv = NULL;
+ $cuv = NULL;
}
}
@@ -55,6 +55,7 @@
// which can be 'conjugări', 'declinări' or both
if (!empty($lexems)) {
$ifMaps = array();
+ $modelTypes = array();
$conjugations = false;
$declensions = false;
$filtered_lexems = array();
@@ -64,6 +65,7 @@
$filtered_lexems[] = $l;
$conjugations = true;
$ifMaps[] = InflectedForm::loadByLexemIdMapByInflectionRank($l->id);
+ $modelTypes[] = ModelType::get_by_code($l->modelType);
}
}
elseif (TYPE_SHOW_NO_VERBS == $type) {
@@ -71,11 +73,13 @@
$filtered_lexems[] = $l;
$declensions = true;
$ifMaps[] = InflectedForm::loadByLexemIdMapByInflectionRank($l->id);
+ $modelTypes[] = ModelType::get_by_code($l->modelType);
}
}
else {
$filtered_lexems[] = $l;
$ifMaps[] = InflectedForm::loadByLexemIdMapByInflectionRank($l->id);
+ $modelTypes[] = ModelType::get_by_code($l->modelType);
if ($l->modelType == 'V' || $l->modelType == 'VT') {
$conjugations = true;
} else {
@@ -116,6 +120,7 @@
SmartyWrap::assign('sourceNamesArr', $sourceNamesArr);
SmartyWrap::assign('lexems', $filtered_lexems);
SmartyWrap::assign('ifMaps', $ifMaps);
+ SmartyWrap::assign('modelTypes', $modelTypes);
SmartyWrap::assign('showParadigm', true);
SmartyWrap::assign('onlyParadigm', !$ajax);
}
Modified: wwwbase/search.php
==============================================================================
--- wwwbase/search.php Wed Aug 28 13:37:27 2013 (r961)
+++ wwwbase/search.php Wed Aug 28 17:20:49 2013 (r962)
@@ -194,11 +194,13 @@
// which can be 'conjugări', 'declinări' or both
if (!empty($lexems)) {
$ifMaps = array();
+ $modelTypes = array();
$conjugations = false;
$declensions = false;
foreach ($lexems as $l) {
if ($showParadigm) {
$ifMaps[] = InflectedForm::loadByLexemIdMapByInflectionRank($l->id);
+ $modelTypes[] = ModelType::get_by_code($l->modelType);
}
if ($l->modelType == 'V' || $l->modelType == 'VT') {
$conjugations = true;
@@ -220,6 +222,7 @@
if ($showParadigm) {
SmartyWrap::assign('ifMaps', $ifMaps);
+ SmartyWrap::assign('modelTypes', $modelTypes);
}
SmartyWrap::assign('declensionText', $declensionText);
More information about the Dev
mailing list